diff --git a/src/ui/static/resources/js/components/user/toggle-admin.directive.js b/src/ui/static/resources/js/components/user/toggle-admin.directive.js
index c332823f5..33c3d0dc1 100644
--- a/src/ui/static/resources/js/components/user/toggle-admin.directive.js
+++ b/src/ui/static/resources/js/components/user/toggle-admin.directive.js
@@ -36,25 +36,22 @@
         .error(toggleAdminFailed);        
     }    
     
+    function toggleStatus() {
+      vm.isAdmin = !vm.isAdmin;
+      vm.enabled = vm.isAdmin ? 0 : 1;
+    }
+    
     function toggleAdminSuccess(data, status) {
-      if(vm.isAdmin) {
-        vm.isAdmin = false;
-      }else{
-        vm.isAdmin = true;
-      }
       console.log('Toggled userId:' + vm.userId + ' to admin:' + vm.isAdmin);
+      toggleStatus();
     }
 
     function toggleAdminFailed(data, status) {
+      console.log('Failed to toggle admin:' + data);
+      toggleStatus();
       $scope.$emit('modalTitle', $filter('tr')('error'));
       $scope.$emit('modalMessage', $filter('tr')('failed_to_toggle_admin'));
       $scope.$emit('raiseError', true);
-      if(vm.isAdmin) {
-        vm.isAdmin = false;
-      }else{
-        vm.isAdmin = true;
-      }
-      console.log('Failed to toggle admin:' + data);
     }    
   }