diff --git a/autoassignrole.module b/autoassignrole.module
index 30c43e4..ad78670 100644
--- a/autoassignrole.module
+++ b/autoassignrole.module
@@ -67,6 +67,11 @@ function autoassignrole_menu() {
  * Implements hook_user_presave().
  */
 function autoassignrole_user_presave(&$edit, $account, $category) {
+  // If do not want to auto assign roles for admin created accounts
+  if (user_access('administer users') && !variable_get('autoassignrole_admin_active', 0)) {
+    return;
+  }
+
   // Use case http://drupal.org/node/971622
   // Make sure we only assign roles automatically when enabled to do so.
   if (variable_get('autoassignrole_auto_active', 0) || variable_get("autoassignrole_user_active", 0)) {