diff --git a/src/app/vault/vaultEditLoginController.js b/src/app/vault/vaultEditLoginController.js
index 1e27dfd51b..19b1d171c9 100644
--- a/src/app/vault/vaultEditLoginController.js
+++ b/src/app/vault/vaultEditLoginController.js
@@ -10,11 +10,11 @@
 
         authService.getUserProfile().then(function (profile) {
             $scope.useTotp = profile.premium;
-        });
-
-        apiService.logins.get({ id: loginId }, function (login) {
+            return apiService.logins.get({ id: loginId }).$promise;
+        }).then(function (login) {
             $scope.login = cipherService.decryptLogin(login);
             $scope.readOnly = !login.Edit;
+            $scope.useTotp = $scope.useTotp || $scope.login.organizationUseTotp;
         });
 
         $scope.save = function (model) {