diff --git a/src/models/api/requestModels.js b/src/models/api/requestModels.js
index 684cdcbb..9f80a12e 100644
--- a/src/models/api/requestModels.js
+++ b/src/models/api/requestModels.js
@@ -40,7 +40,7 @@ var TokenRequest = function (email, masterPasswordHash, provider, token, remembe
     this.masterPasswordHash = masterPasswordHash;
     this.token = token;
     this.provider = provider;
-    this.remember = remember || remember !== false;
+    this.remember = remember === true;
     this.device = null;
     if (device) {
         this.device = device;
diff --git a/src/popup/app/lock/lockController.js b/src/popup/app/lock/lockController.js
index f6b42e67..f764e50d 100644
--- a/src/popup/app/lock/lockController.js
+++ b/src/popup/app/lock/lockController.js
@@ -2,9 +2,12 @@
     .module('bit.lock')
 
     .controller('lockController', function ($scope, $state, $analytics, i18nService, cryptoService, toastr,
-        userService, SweetAlert) {
+        userService, SweetAlert, $timeout) {
         $scope.i18n = i18nService;
-        $('#master-password').focus();
+
+        $timeout(function () {
+            $('#master-password').focus();
+        });
 
         $scope.logOut = function () {
             SweetAlert.swal({
diff --git a/src/services/apiService.js b/src/services/apiService.js
index ac250f7c..3a204367 100644
--- a/src/services/apiService.js
+++ b/src/services/apiService.js
@@ -57,7 +57,7 @@ function initApiService() {
 
         // Hack for Edge. For some reason tokenRequest loses proto. Rebuild it here.
         tokenRequest = new TokenRequest(tokenRequest.email, tokenRequest.masterPasswordHash, tokenRequest.provider,
-            tokenRequest.token, tokenRequest.remeber, tokenRequest.device);
+            tokenRequest.token, tokenRequest.remember, tokenRequest.device);
 
         $.ajax({
             type: 'POST',