diff --git a/app/assets/javascripts/app/services/helpers/encryptionHelper.js b/app/assets/javascripts/app/services/helpers/encryptionHelper.js
index 08095d4f0..e0e171af5 100644
--- a/app/assets/javascripts/app/services/helpers/encryptionHelper.js
+++ b/app/assets/javascripts/app/services/helpers/encryptionHelper.js
@@ -1,14 +1,8 @@
 class EncryptionHelper {
 
   static encryptItem(item, key) {
-    var item_key = null;
-    // if(item.enc_item_key) {
-    //   // we reuse the key, but this is optional
-    //   item_key = Neeto.crypto.decryptText(item.enc_item_key, key);
-    // } else {
-      item_key = Neeto.crypto.generateRandomEncryptionKey();
-      item.enc_item_key = Neeto.crypto.encryptText(item_key, key);
-    // }
+    var item_key = Neeto.crypto.generateRandomEncryptionKey();
+    item.enc_item_key = Neeto.crypto.encryptText(item_key, key);
 
     var ek = Neeto.crypto.firstHalfOfKey(item_key);
     var ak = Neeto.crypto.secondHalfOfKey(item_key);
diff --git a/app/assets/templates/frontend/directives/account-menu.html.haml b/app/assets/templates/frontend/directives/account-menu.html.haml
index 628cd68f8..a1e03cd1e 100644
--- a/app/assets/templates/frontend/directives/account-menu.html.haml
+++ b/app/assets/templates/frontend/directives/account-menu.html.haml
@@ -28,7 +28,13 @@
     %div{"ng-if" => "user"}
       %h2 {{user.email}}
       %p {{server}}
-      %a.block.mt-10{"href" => "{{dashboardURL()}}", "target" => "_blank"} → Standard File Dashboard
+      %div.bold.mt-10.blue{"delay-hide" => "true", "show" => "syncStatus.syncOpInProgress || syncStatus.needsMoreSync", "delay" => "1000"}
+        .spinner.inline.mr-5.blue
+        {{"Syncing" + (syncStatus.total > 0 ? ":" : "")}}
+        %span{"ng-if" => "syncStatus.total > 0"} {{syncStatus.current}}/{{syncStatus.total}}
+      %p.bold.mt-10.red.block{"ng-if" => "syncStatus.error"} Error syncing: {{syncStatus.error.message}}
+
+      %a.block.mt-15{"href" => "{{dashboardURL()}}", "target" => "_blank"} → Standard File Dashboard
       %a.block.mt-5{"ng-click" => "showCredentials = !showCredentials"} Show Credentials
       %section.gray-bg.mt-10.medium-padding{"ng-if" => "showCredentials"}
         %label.block
@@ -55,12 +61,6 @@
               %button.btn.dark-button.btn-block{"ng-click" => "submitPasswordChange()"} Submit
         %p.italic.mt-10{"ng-if" => "newPasswordData.status"} {{newPasswordData.status}}
 
-      %div.bold.mt-10.blue{"delay-hide" => "true", "show" => "syncStatus.syncOpInProgress || syncStatus.needsMoreSync", "delay" => "1000"}
-        .spinner.inline.mr-5.blue
-        {{"Syncing" + (syncStatus.total > 0 ? ":" : "")}}
-        %span{"ng-if" => "syncStatus.total > 0"} {{syncStatus.current}}/{{syncStatus.total}}
-      %p.bold.mt-10.red.block{"ng-if" => "syncStatus.error"} Error syncing: {{syncStatus.error.message}}
-
       .medium-v-space
 
       %h4 Local Encryption