diff --git a/client/components/sidebar/sidebar.jade b/client/components/sidebar/sidebar.jade
index 3bc6f8435..991fa1cf6 100644
--- a/client/components/sidebar/sidebar.jade
+++ b/client/components/sidebar/sidebar.jade
@@ -288,82 +288,35 @@ template(name="boardMenuPopup")
         a.js-change-board-color
           i.fa.fa-paint-brush
           | {{_ 'board-change-color'}}
-
-    //-
-      XXX Language should be handled by sandstorm, but for now display a
-      language selection link in the board menu. This link is normally present
-      in the header bar that is not displayed on sandstorm.
-    if isSandstorm
+  hr
+  ul.pop-over-list
+    if withApi
       li
-        a.js-change-language
-          i.fa.fa-flag
-          | {{_ 'language'}}
-  unless isSandstorm
-    hr
-    ul.pop-over-list
-      if withApi
-        li
-          a.js-export-board
-            i.fa.fa-share-alt
-            | {{_ 'export-board'}}
-      if currentUser.isBoardAdmin
-        li
-          a.js-outgoing-webhooks
-            i.fa.fa-globe
-            | {{_ 'outgoing-webhooks'}}
-        li
-          a.js-card-settings
-            i.fa.fa-id-card-o
-            | {{_ 'card-settings'}}
-        li
-          a.js-subtask-settings
-            i.fa.fa-sitemap
-            | {{_ 'subtask-settings'}}
-    unless currentBoard.isTemplatesBoard
-      if currentUser.isBoardAdmin
-        hr
-        ul.pop-over-list
-          li
-            a.js-archive-board
-              i.fa.fa-arrow-right
-              i.fa.fa-archive
-              | {{_ 'archive-board'}}
-
-  if isSandstorm
-    hr
-    ul.pop-over-list
-      if currentUser.isMember
-        li
-          a.js-export-board
-            i.fa.fa-share-alt
-            | {{_ 'export-board'}}
-        li
-          a.js-import-board
-            i.fa.fa-share-alt
-            i.fa.fa-sign-in
-            | {{_ 'import-board-c'}}
-      if currentUser.isBoardAdmin
+        a.js-export-board
+          i.fa.fa-share-alt
+          | {{_ 'export-board'}}
+    if currentUser.isBoardAdmin
+      li
+        a.js-outgoing-webhooks
+          i.fa.fa-globe
+          | {{_ 'outgoing-webhooks'}}
+      li
+        a.js-card-settings
+          i.fa.fa-id-card-o
+          | {{_ 'card-settings'}}
+      li
+        a.js-subtask-settings
+          i.fa.fa-sitemap
+          | {{_ 'subtask-settings'}}
+  unless currentBoard.isTemplatesBoard
+    if currentUser.isBoardAdmin
+      hr
+      ul.pop-over-list
         li
           a.js-archive-board
             i.fa.fa-arrow-right
             i.fa.fa-archive
             | {{_ 'archive-board'}}
-      li
-        a.js-outgoing-webhooks
-          i.fa.fa-globe
-          | {{_ 'outgoing-webhooks'}}
-    hr
-    ul.pop-over-list
-      li
-        a.js-card-settings
-          i.fa.fa-id-card-o
-          | {{_ 'card-settings'}}
-    hr
-    ul.pop-over-list
-      li
-        a.js-subtask-settings
-          i.fa.fa-sitemap
-          | {{_ 'subtask-settings'}}
 
 template(name="exportBoard")
   ul.pop-over-list
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index 81fbe26a5..37fa20607 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -58,10 +58,10 @@ template(name="memberMenuPopup")
           a.js-change-password
             i.fa.fa-key
             | {{_ 'changePasswordPopup-title'}}
-        li
-          a.js-change-language
-            i.fa.fa-flag
-            | {{_ 'changeLanguagePopup-title'}}
+      li
+        a.js-change-language
+          i.fa.fa-flag
+          | {{_ 'changeLanguagePopup-title'}}
   unless isSandstorm
     hr
     ul.pop-over-list