diff --git a/js/Makefile b/js/Makefile
index d064845..3b9c639 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -1,6 +1,7 @@
 JSSRC=							\
 	Utils.js					\
 	LoginWindow.js					\
+	RoleSelector.js					\
 	ServerStatus.js					\
 	ServerAdministration.js				\
 	LDAPProfileSelector.js				\
diff --git a/js/RoleSelector.js b/js/RoleSelector.js
new file mode 100644
index 0000000..1b84e0a
--- /dev/null
+++ b/js/RoleSelector.js
@@ -0,0 +1,10 @@
+Ext.define('PMG.RoleSelector', {
+    extend: 'Proxmox.form.KVComboBox',
+    alias: 'widget.pmgRoleSelector',
+
+    comboItems: [
+	['admin', gettext('Administrator')],
+	['qmanager', gettext('Quarantine Manager')],
+	['audit', gettext('Auditor')]
+    ]
+});
diff --git a/js/UserEdit.js b/js/UserEdit.js
index fb471da..6aec13c 100644
--- a/js/UserEdit.js
+++ b/js/UserEdit.js
@@ -64,8 +64,9 @@ Ext.define('PMG.UserEdit', {
 
 	column1.push(
 	    {
-		xtype: 'textfield',
+		xtype: 'pmgRoleSelector',
 		name: 'role',
+		disabled: me.userid === 'root@pam',
 		allowBlank: false,
 		fieldLabel: gettext('Role')
 	    },