diff --git a/src/js/client.js b/src/js/client.js
index 4938c5d6b..60f4c68fe 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1270,7 +1270,8 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
             email: user.email,
             displayName: user.displayName,
             fallbackEmail: user.fallbackEmail,
-            admin: user.admin
+            admin: user.admin,
+            active: user.active
         };
 
         post('/api/v1/users/' + user.id, data, null, function (error, data, status) {
@@ -1357,6 +1358,19 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         });
     };
 
+    Client.prototype.setUserActive = function (userId, active, callback) {
+        var data = {
+            active: active
+        };
+
+        post('/api/v1/users/' + userId + '/active', data, null, function (error, data, status) {
+            if (error) return callback(error);
+            if (status !== 200) return callback(new ClientError(status, data));
+
+            callback(null);
+        });
+    };
+
     Client.prototype.refreshUserInfo = function (callback) {
         var that = this;
 
diff --git a/src/views/users.html b/src/views/users.html
index 7b02822d3..e2504b88f 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -137,6 +137,13 @@
                             </label>
                         </div>
                     </div>
+                    <div class="form-group" ng-hide="isMe(useredit.userInfo)">
+                        <div class="checkbox">
+                            <label>
+                                <input type="checkbox" ng-model="useredit.active"> User is active</a>
+                            </label>
+                        </div>
+                    </div>
                     <input class="hide" type="submit" ng-disabled="useredit_form.$invalid || useredit.busy"/>
                 </form>
             </div>
@@ -306,7 +313,7 @@
                 </tr>
               </thead>
               <tbody>
-                <tr ng-repeat="user in users">
+                <tr ng-repeat="user in users" ng-class="{'text-muted': !user.active}">
                   <td>
                     <i class="fa fa-briefcase arrow" ng-show="user.admin" uib-tooltip="This user can manage apps, groups and other users"></i>
                   </td>
diff --git a/src/views/users.js b/src/views/users.js
index 16111fe41..390ad5751 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -166,6 +166,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         aliases: {},
         displayName: '',
         admin: false,
+        active: false,
         selectedGroups: [],
 
         show: function (userInfo) {
@@ -176,6 +177,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.useredit.userInfo = userInfo;
             $scope.useredit.selectedGroups = userInfo.groupIds.map(function (gid) { return $scope.groupsById[gid]; });
             $scope.useredit.admin = userInfo.admin;
+            $scope.useredit.active = userInfo.active;
 
             $scope.useredit_form.$setPristine();
             $scope.useredit_form.$setUntouched();
@@ -193,7 +195,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
                 email: $scope.useredit.email,
                 displayName: $scope.useredit.displayName,
                 fallbackEmail: $scope.useredit.fallbackEmail,
-                admin: $scope.useredit.admin
+                admin: $scope.useredit.admin,
+                active: $scope.useredit.active
             };
 
             Client.updateUser(data, function (error) {