diff --git a/app/assets/javascripts/app/frontend/controllers/header.js b/app/assets/javascripts/app/frontend/controllers/header.js
index 513776573..76c56bc32 100644
--- a/app/assets/javascripts/app/frontend/controllers/header.js
+++ b/app/assets/javascripts/app/frontend/controllers/header.js
@@ -172,14 +172,7 @@ angular.module('app.frontend')
 
     this.encryptionStatusForNotes = function() {
       var allNotes = modelManager.filteredNotes;
-      var countEncrypted = 0;
-      allNotes.forEach(function(note){
-        if(note.encryptionEnabled()) {
-          countEncrypted++;
-        }
-      }.bind(this))
-
-      return countEncrypted + "/" + allNotes.length + " notes encrypted";
+      return allNotes.length + "/" + allNotes.length + " notes encrypted";
     }
 
     this.archiveEncryptionFormat = {encrypted: true};
@@ -233,15 +226,7 @@ angular.module('app.frontend')
     }
 
     this.onAuthSuccess = function(user) {
-
-      // if(this.user.shouldMerge && this.hasLocalData()) {
-        // apiController.mergeLocalDataRemotely(this.user, function(){
-        //   window.location.reload();
-        // });
-      // } else {
-        window.location.reload();
-      // }
-
+      window.location.reload();
       this.showLogin = false;
       this.showRegistration = false;
     }
diff --git a/app/assets/javascripts/app/services/apiController.js b/app/assets/javascripts/app/services/apiController.js
index f38e6ebde..56440b501 100644
--- a/app/assets/javascripts/app/services/apiController.js
+++ b/app/assets/javascripts/app/services/apiController.js
@@ -247,7 +247,7 @@ angular.module('app.frontend')
 
           var retrieved = this.handleItemsResponse(response.retrieved_items, null);
           // merge only metadata for saved items
-          var omitFields = ["content", "enc_item_key", "auth_hash"];
+          var omitFields = ["content", "auth_hash"];
           var saved = this.handleItemsResponse(response.saved_items, omitFields);
 
           this.handleUnsavedItemsResponse(response.unsaved)