diff --git a/src/js/client.js b/src/js/client.js
index 4abf4aff6..ad0651b5e 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -1469,7 +1469,8 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
             displayName: user.displayName,
             fallbackEmail: user.fallbackEmail,
             admin: user.admin,
-            active: user.active
+            active: user.active,
+            permissions: user.permissions
         };
 
         post('/api/v1/users/' + user.id, data, null, function (error, data, status) {
diff --git a/src/views/users.html b/src/views/users.html
index d6c5d477b..71c5c27da 100644
--- a/src/views/users.html
+++ b/src/views/users.html
@@ -137,13 +137,27 @@
             </div>
           </div>
           <div class="form-group" ng-hide="isMe(useredit.userInfo)">
+            <label class="control-label">Permissions</label>
             <div class="checkbox">
               <label>
                 <input type="checkbox" ng-model="useredit.admin"> User is an administrator <sup><a ng-href="{{ config.webServerOrigin }}/documentation/user-management/#administrators" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
               </label>
             </div>
+            <div class="radio col-xs-offset-1" ng-hide="useredit.admin">
+              <label>
+                <input type="radio" ng-model="useredit.role" value="">
+                <span>Normal user, only access apps</span>
+              </label>
+            </div>
+            <div class="radio col-xs-offset-1" ng-hide="useredit.admin">
+              <label>
+                <input type="radio" ng-model="useredit.role" value="manage_users">
+                <span>Can also manage users</span>
+              </label>
+            </div>
           </div>
           <div class="form-group" ng-hide="isMe(useredit.userInfo)">
+            <label class="control-label">Active State</label>
             <div class="checkbox">
               <label>
                 <input type="checkbox" ng-model="useredit.active"> User is active <sup><a ng-href="{{ config.webServerOrigin }}/documentation/user-management/#disable-user" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
diff --git a/src/views/users.js b/src/views/users.js
index c5bf7d915..68cda1567 100644
--- a/src/views/users.js
+++ b/src/views/users.js
@@ -181,6 +181,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
         active: false,
         source: '',
         selectedGroups: [],
+        role: '',
 
         show: function (userInfo) {
             $scope.useredit.error = {};
@@ -192,6 +193,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             $scope.useredit.admin = userInfo.admin;
             $scope.useredit.active = userInfo.active;
             $scope.useredit.source = userInfo.source;
+            // TODO once we have more roles, we have to change this
+            $scope.useredit.role = userInfo.permissions ? userInfo.permissions[0] : '';
 
             $scope.useredit_form.$setPristine();
             $scope.useredit_form.$setUntouched();
@@ -207,7 +210,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
             var data = {
                 id: userId,
                 admin: $scope.useredit.admin,
-                active: $scope.useredit.active
+                active: $scope.useredit.active,
+                permissions: $scope.useredit.role ? [ $scope.useredit.role ] : null
             };
 
             // only change those if it is a local user