diff --git a/modules/Users/actions/Save.php b/modules/Users/actions/Save.php
index 3f70b7f79523cea657bb82eb8d2954cd77686180..0852c1f2bdc8719fa18416ab1efbb2349f7c3590 100644
--- a/modules/Users/actions/Save.php
+++ b/modules/Users/actions/Save.php
@@ -69,6 +69,10 @@ class Users_Save_Action extends Vtiger_Save_Action {
 			if ($fieldName == 'is_owner') {
 				$fieldValue = null;
 			}
+			if ($fieldName == 'roleid' && !($currentUserModel->isAdminUser())) {
+				$fieldValue = null;
+			}
+
 			if($fieldValue !== null) {
 				if(!is_array($fieldValue)) {
 					$fieldValue = trim($fieldValue);
diff --git a/modules/Users/actions/SaveAjax.php b/modules/Users/actions/SaveAjax.php
index f5edb385de356545ee057843b21fdbb8694634a6..41e11bed7ff3e453d45c761558de49455a08cb02 100644
--- a/modules/Users/actions/SaveAjax.php
+++ b/modules/Users/actions/SaveAjax.php
@@ -86,7 +86,7 @@ class Users_SaveAjax_Action extends Vtiger_SaveAjax_Action {
 			$recordModel->set($fieldName, 'off');
 		}
 
-		if($fieldName == "is_owner") {
+		if($fieldName == "is_owner" || $fieldName == "roleid") {
 			$recordId = $request->get('record');
 			$moduleName = $request->getModule();
 			if(!empty($recordId)) {