diff --git a/src/js/angular/security/controllers.js b/src/js/angular/security/controllers.js
index 4b18be399..2930ee155 100644
--- a/src/js/angular/security/controllers.js
+++ b/src/js/angular/security/controllers.js
@@ -377,6 +377,16 @@ securityCtrl.controller('CommonUserCtrl', ['$rootScope', '$scope', '$http', 'toa
             setGrantedAuthorities($scope);
         };
 
+        $scope.resetCustomRoleField = function () {
+            if (!$scope.isUser()) {
+                $scope.customRoles = "";
+            }
+        };
+
+        $scope.isUser = function () {
+            return $scope.userType === UserType.USER;
+        };
+
         $scope.hasReadPermission = function (repository) {
             const uniqueKey = createUniqueKey(repository);
             return $scope.userType === UserType.ADMIN || $scope.userType === UserType.REPO_MANAGER
diff --git a/src/js/angular/security/templates/user.html b/src/js/angular/security/templates/user.html
index ece1f808c..11dc9af29 100644
--- a/src/js/angular/security/templates/user.html
+++ b/src/js/angular/security/templates/user.html
@@ -181,7 +181,7 @@ <h3>{{'security.workbench.settings.title' | translate}}
 
 			<div class="col-md-6 us-right-col" ng-hide="!isLocalAuthentication()">
 				<div class="card user-role" id="user-roles">
-					<div class="card-block">
+					<div class="card-block" ng-click="resetCustomRoleField()">
 						<h3>{{'security.user.role' | translate}}</h3>
 						<label class="mr-1"
 							   uib-popover-template="'popover-content-user.html'"
@@ -210,7 +210,8 @@ <h3>{{'security.user.role' | translate}}</h3>
                     <div class="card-block">
                         <h3>{{'security.user.custom_role' | translate}}</h3>
                         <div class="input-group">
-                            <tags-input class="wb-tags-input" ng-model="customRoles" min-length="2" ng-disabled="hasEditRestrictions()"
+                            <tags-input class="wb-tags-input" ng-model="customRoles" min-length="2"
+                                        ng-disabled="!isUser()"
                                         use-strings="true"
                                         add-on-space="true"
                                         add-on-comma="true"