diff --git a/ajax/settings.php b/ajax/settings.php
index 69b8e63..1d8ea2e 100644
--- a/ajax/settings.php
+++ b/ajax/settings.php
@@ -9,7 +9,7 @@ OCP\JSON::checkAppEnabled('user_sql');
 // CSRF checks
 OCP\JSON::callCheck();
 
-$l = new OC_L10N('use_sql');
+$l = new OC_L10N('user_sql');
 
 $params = array('sql_host', 'sql_user', 'sql_database', 'sql_password', 
         'sql_table', 'sql_column_username', 'sql_column_password', 'sql_type', 
diff --git a/user_sql.php b/user_sql.php
index fc1fc51..547eba0 100644
--- a/user_sql.php
+++ b/user_sql.php
@@ -282,7 +282,6 @@ class OC_USER_SQL extends OC_User_Backend implements OC_User_Interface
             return false;
         }
         $query = "SELECT $this->sql_column_username FROM $this->sql_table";
-        $search = $this -> doUserDomainMapping($search);
         if($search != '')
             $query .= " WHERE $this->sql_column_username LIKE :search";
         if($this -> sql_column_active != '')
@@ -308,7 +307,7 @@ class OC_USER_SQL extends OC_User_Backend implements OC_User_Interface
         $result = $this -> db -> prepare($query);
         if($search != '')
         {
-            $search = "%$search%";
+            $search = "%".$this -> doUserDomainMapping($search."%")."%";
             $result -> bindParam(":search", $search);
         }
         OC_Log::write('OC_USER_SQL', "Executing query...", OC_Log::DEBUG);