Index: autoassignrole.module
===================================================================
--- autoassignrole.module
+++ autoassignrole.module
@@ -132,24 +132,22 @@
       if(variable_get('AUTOASSIGNROLE_ROLE_ACTIVE','0') == 1) {
         $roles = variable_get('AUTOASSIGNROLE_ROLE','0');
         if(is_array($roles)) {
-          $sql = 'INSERT INTO {users_roles} (uid, rid) values (%d, %d)';
           foreach($roles as $key => $value) {
             if($value > 0) {
-              db_query($sql, $user->uid, $value);
+              $edit['roles'][] = $value;
             }
           }
         }
       }
       if(variable_get('AUTOASSIGNROLE_ROLE_USER_ACTIVE','0') == 1) {
-        $sql = 'INSERT INTO {users_roles} (uid, rid) values (%d, %d)';
         if(is_array($edit['AUTOASSIGNROLE_ROLE_USER'])) {
           foreach($edit['AUTOASSIGNROLE_ROLE_USER'] as $key => $value) {
             if($value > 0) {
-              db_query($sql, $user->uid, $value);
+              $edit['roles'][] = $value;
             }
           }
         } else {
-          db_query($sql, $user->uid, $edit['AUTOASSIGNROLE_ROLE_USER']);
+          $edit['roles'][] = $edit['AUTOASSIGNROLE_ROLE_USER'];
         }
       }
      break;