--- a/domain_bonus_login_restrict/domain_bonus_login_restrict.module	2012-04-23 15:56:47.000000000 -0500
+++ b/domain_bonus_login_restrict/domain_bonus_login_restrict.module	2012-04-23 10:59:32.000000000 -0500
@@ -73,21 +73,21 @@
   // if set make user check by domain affiliation 
   if (variable_get('domain_bonus_login_restrict', 0) && !empty($form_state['uid'])) {
     
-    $account = db_query("SELECT * FROM {users} WHERE uid = :uid AND status = 1", array(':uid' => $form_state['uid']))->fetchObject();
-    
+    $account = user_load($form_state['uid']);
+
     if (!user_access('login to any domain', $account)) {
       $user_domains = domain_get_user_domains($account);
 
       // user_domains retruns [-1] = -1 for current domain
       // make it in proper way 
-      if ($user_domains[-1] == -1) {
+      if (isset($user_domains[-1]) && $user_domains[-1] == -1) {
         $user_domains[0] = TRUE;
       }
       
       $domain = domain_get_domain();
       
       // if user doesn't belong to this domain
-      if (!$user_domains[$domain['domain_id']]) {
+      if (!isset($user_domains[$domain['domain_id']])) {
         // Do not allow login to get finalized
         $form_state['uid'] = NULL;
       }
