Fixes to account users view

src/app/features/account/accountUsersCtrl.js

@@ -26,7 +26,7 @@ function (angular) {
     $scope.removeUser = function(user) {
       backendSrv.request({
         method: 'DELETE',
-        url: '/api/account/users/' + user.id,
+        url: '/api/account/users/' + user.userId
       }).then($scope.get);
     };
 

src/app/features/account/partials/users.html

@@ -26,7 +26,7 @@
 								role
 							</li>
 							<li>
-								<select type="text" ng-model="user.role" class="input-small tight-form-input" ng-options="f for f in ['viewer', 'editor', 'admin']">
+								<select type="text" ng-model="user.role" class="input-small tight-form-input" ng-options="f for f in ['Viewer', 'Editor', 'Admin']">
 								</select>
 							</li>
 							<li>