diff --git a/role_delegation.module b/role_delegation.module
index fdd26f0..8d2f8ea 100644
--- a/role_delegation.module
+++ b/role_delegation.module
@@ -91,6 +91,9 @@ function _role_delegation_add_roles_to_form(&$form, $account) {
     );
   }
 
+  // Unset original roles select field
+  unset($form['account']['roles']);
+
   // Generate the form items.
   $form['account']['roles_change'] = array(
     '#type' => 'checkboxes',
@@ -192,9 +195,6 @@ function role_delegation_form_alter(&$form, $form_state, $form_id) {
         || ($form_id == 'user_profile_form'  && $form['#user_category'] == 'account' ) )) {
     return;
   }
-  if (user_access('administer permissions')) {
-    return;
-  }
 
   $account = $form['#user'];
   _role_delegation_add_roles_to_form($form, $account);