diff --git a/out/out.UsrMgr.php b/out/out.UsrMgr.php
index a506b2439..0800254ba 100644
--- a/out/out.UsrMgr.php
+++ b/out/out.UsrMgr.php
@@ -40,6 +40,11 @@ if (is_bool($groups)) {
 	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
 }
 
+$roles = $dms->getAllRoles();
+if (is_bool($roles)) {
+	UI::exitError(getMLText("admin_tools"),getMLText("internal_error"));
+}
+
 if(isset($_GET['userid']) && $_GET['userid']) {
 	$seluser = $dms->getUser($_GET['userid']);
 } else {
@@ -47,7 +52,7 @@ if(isset($_GET['userid']) && $_GET['userid']) {
 }
 
 $tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
-$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota, 'strictformcheck'=>$settings->_strictFormCheck));
+$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user, 'seluser'=>$seluser, 'allusers'=>$users, 'allgroups'=>$groups, 'allroles'=>$roles, 'passwordstrength'=>$settings->_passwordStrength, 'passwordexpiration'=>$settings->_passwordExpiration, 'httproot'=>$settings->_httpRoot, 'enableuserimage'=>$settings->_enableUserImage, 'undeluserids'=>explode(',', $settings->_undelUserIds), 'workflowmode'=>$settings->_workflowMode, 'quota'=>$settings->_quota, 'strictformcheck'=>$settings->_strictFormCheck));
 if($view) {
 	$view($_GET);
 }
diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php
index 344f063a4..10c82afc8 100644
--- a/views/bootstrap/class.UsrMgr.php
+++ b/views/bootstrap/class.UsrMgr.php
@@ -157,6 +157,7 @@ $(document).ready( function() {
 		$user = $this->params['user'];
 		$users = $this->params['allusers'];
 		$groups = $this->params['allgroups'];
+		$roles = $this->params['allroles'];
 		$passwordstrength = $this->params['passwordstrength'];
 		$passwordexpiration = $this->params['passwordexpiration'];
 		$httproot = $this->params['httproot'];
@@ -240,7 +241,13 @@ $(document).ready( function() {
 		</tr>
 		<tr>
 			<td><?php printMLText("role");?>:</td>
-			<td><select name="role"><option value="<?php echo SeedDMS_Core_User::role_user ?>"><?php printMLText("role_user"); ?></option><option value="<?php echo SeedDMS_Core_User::role_admin ?>" <?php if($currUser && $currUser->getRole() == SeedDMS_Core_User::role_admin) echo "selected"; ?>><?php printMLText("role_admin"); ?></option><option value="<?php echo SeedDMS_Core_User::role_guest ?>" <?php if($currUser && $currUser->getRole() == SeedDMS_Core_User::role_guest) echo "selected"; ?>><?php printMLText("role_guest"); ?></option></select></td>
+			<td><select name="role">
+<?php
+		foreach($roles as $role) {
+			echo '<option value="'.$role->getID().'"'.($currUser && $currUser->getRole()->getID() == $role->getID() ? ' selected' : '').'>'.$role->getName().'</option>';
+		}
+?>
+			</select></td>
 		</tr>
 		<tr>
 			<td><?php printMLText("groups");?>:</td>