diff --git a/appinfo/version b/appinfo/version
--- a/appinfo/version
+++ b/appinfo/version
@@ -1,1 +1,1 @@
-0.3
+0.4
diff --git a/settings.php b/settings.php
--- a/settings.php
+++ b/settings.php
@@ -1,53 +1,60 @@
 <?php
 
 /**
  * ownCloud - user_sql
  *
  * @author Andreas Böhler
  * @copyright 2012 Andreas Böhler <andreas (at) aboehler (dot) at>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
  * You should have received a copy of the GNU Affero General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-$params = array('sql_host', 'sql_user', 'sql_database', 'sql_password', 'sql_table', 'sql_column_username', 'sql_column_password', 'sql_type', 'sql_column_active');
+$params = array('sql_host', 'sql_user', 'sql_database', 'sql_password', 'sql_table', 'sql_column_username', 'sql_column_password', 'sql_type', 'sql_column_active', 'strip_domain', 'default_domain');
 
 OCP\Util::addscript('user_sql', 'settings');
 
 if ($_POST) {
-       foreach($params as $param){
-               if(isset($_POST[$param])){
-                       OCP\Config::setAppValue('user_sql', $param, $_POST[$param]);
-               }
-       }
+    foreach($params as $param){
+        if(isset($_POST[$param]))
+        {
+            OCP\Config::setAppValue('user_sql', $param, $_POST[$param]);
+        }
+        elseif($param == 'strip_domain')
+        {
+            OCP\Config::setAppValue('user_sql', $param, 0);
+        }
+    }
 }
 
 // fill template
 $tmpl = new OCP\Template( 'user_sql', 'settings');
 foreach($params as $param){
        $value = htmlentities(OCP\Config::getAppValue('user_sql', $param,''));
        $tmpl->assign($param, $value);
 }
 
 // settings with default values
 $tmpl->assign( 'sql_host', OCP\Config::getAppValue('user_sql', 'sql_host', OC_USER_BACKEND_SQL_DEFAULT_HOST));
 $tmpl->assign( 'sql_user', OCP\Config::getAppValue('user_sql', 'sql_user', OC_USER_BACKEND_SQL_DEFAULT_USER));
 $tmpl->assign( 'sql_database', OCP\Config::getAppValue( 'user_sql', 'sql_database', OC_USER_BACKEND_SQL_DEFAULT_DB));
 $tmpl->assign( 'sql_password', OCP\Config::getAppValue( 'user_sql', 'sql_password', OC_USER_BACKEND_SQL_DEFAULT_PASSWORD));
 $tmpl->assign( 'sql_table', OCP\Config::getAppValue( 'user_sql', 'sql_table', OC_USER_BACKEND_SQL_DEFAULT_TABLE));
 $tmpl->assign( 'sql_column_password', OCP\Config::getAppValue( 'user_sql', 'sql_column_password', OC_USER_BACKEND_SQL_DEFAULT_PW_COLUMN));
 $tmpl->assign( 'sql_column_username', OCP\Config::getAppValue( 'user_sql', 'sql_column_username', OC_USER_BACKEND_SQL_DEFAULT_USER_COLUMN));
 $tmpl->assign( 'sql_type', OCP\Config::getAppValue( 'user_sql', 'sql_type', OC_USER_BACKEND_SQL_DEFAULT_DRIVER));
 $tmpl->assign( 'sql_column_active', OCP\Config::getAppValue( 'user_sql', 'sql_column_active', ''));
+$tmpl->assign( 'strip_domain', OCP\Config::getAppValue( 'user_sql', 'strip_domain', 0));
+$tmpl->assign( 'default_domain', OCP\Config::getAppValue( 'user_sql', 'default_domain', ''));
 
 return $tmpl->fetchPage();
diff --git a/templates/settings.php b/templates/settings.php
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,30 +1,32 @@
 <form id="sql" action="#" method="post">
     <fieldset class="personalblock">
         <legend><?php echo $l->t('SQL'); ?></legend>
             <p><label for="sql_type"><?php echo $l->t('SQL Driver');?></label>
                 <?php $db_driver = array('mysql' => 'MySQL', 'pgsql' => 'PostgreSQL');?>
                 <select id="sql_type" name="sql_type">
                     <?php 
                         foreach ($db_driver as $driver => $name):
                             echo $_['sql_type'];
                             if($_['sql_type'] == $driver): ?>
                                 <option selected="selected" value="<?php echo $driver; ?>"><?php echo $name; ?></option>
                             <?php else: ?>
                                 <option value="<?php echo $driver; ?>"><?php echo $name; ?></option>
                             <?php endif;
                         endforeach; ?>
                 </select>
             </p>
 
             <p><label for="sql_host"><?php echo $l->t('Host');?></label><input type="text" id="sql_host" name="sql_host" value="<?php echo $_['sql_host']; ?>"></p>
             <p><label for="sql_user"><?php echo $l->t('Username');?></label><input type="text" id="sql_user" name="sql_user" value="<?php echo $_['sql_user']; ?>" /></p>
             <p><label for="sql_database"><?php echo $l->t('Database');?></label><input type="text" id="sql_database" name="sql_database" value="<?php echo $_['sql_database']; ?>" /></p>
             <p><label for="sql_password"><?php echo $l->t('Password');?></label><input type="password" id="sql_password" name="sql_password" value="<?php echo $_['sql_password']; ?>" /></p>
             <p><label for="sql_table"><?php echo $l->t('Table');?></label><input type="text" id="sql_table" name="sql_table" value="<?php echo $_['sql_table']; ?>" /></p>
             <p><label for="sql_column_username"><?php echo $l->t('Username Column');?></label><input type="text" id="sql_column_username" name="sql_column_username" value="<?php echo $_['sql_column_username']; ?>" /></p>
             <p><label for="sql_column_password"><?php echo $l->t('Password Column');?></label><input type="text" id="sql_column_password" name="sql_column_password" value="<?php echo $_['sql_column_password']; ?>" /></p>
             <p><label for="sql_column_active"><?php echo $l->t('User Active Column');?></label><input type="text" id="sql_column_active" name="sql_column_active" value="<?php echo $_['sql_column_active']; ?>" /></p>
+            <p><label for="strip_domain"><?php echo $l->t('Strip Domain Part from Username');?></label><input type="checkbox" id="strip_domain" name="strip_domain" value="1"<?php if($_['strip_domain']) echo ' checked'; ?> title="Strip Domain Part from Username when logging in and retrieving username lists"></p>
+            <p><label for="default_domain"><?php echo $l->t('Add default domain to Usernames');?></label><input type="text" id="default_domain" name="default_domain" value="<?php echo $_['default_domain']; ?>" /></p>
 
         <input type="submit" value="<?php echo $l->t('Save'); ?>" />
     </fieldset>
 </form>
diff --git a/user_sql.php b/user_sql.php
--- a/user_sql.php
+++ b/user_sql.php
@@ -1,212 +1,235 @@
 <?php
 
 /**
  * ownCloud - user_sql
  *
  * @author Andreas Böhler
  * @copyright 2012 Andreas Böhler <andreas (at) aboehler (dot) at>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
  * License as published by the Free Software Foundation; either
  * version 3 of the License, or any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
  * You should have received a copy of the GNU Affero General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
 class OC_USER_SQL extends OC_User_Backend implements OC_User_Interface {
 
        // cached settings
         protected $sql_host;
         protected $sql_username;
         protected $sql_database;
         protected $sql_password;
         protected $sql_table;
         protected $sql_column_username;
         protected $sql_column_password;
         protected $sql_column_active;
         protected $sql_type;
         protected $db_conn;
         protected $db;
+        protected $default_domain;
+        protected $strip_domain;
 
         public function __construct() 
         {
             $this->db_conn = false;
             $this->sql_host = OCP\Config::getAppValue('user_sql', 'sql_host', '');
             $this->sql_username = OCP\Config::getAppValue('user_sql', 'sql_user', '');
             $this->sql_database = OCP\Config::getAppValue('user_sql', 'sql_database', '');
             $this->sql_password = OCP\Config::getAppValue('user_sql', 'sql_password', '');
             $this->sql_table = OCP\Config::getAppValue('user_sql', 'sql_table', '');
             $this->sql_column_username = OCP\Config::getAppValue('user_sql', 'sql_column_username', '');
             $this->sql_column_password = OCP\Config::getAppValue('user_sql', 'sql_column_password', '');
             $this->sql_column_active = OCP\Config::getAppValue('user_sql', 'sql_column_active', '');
             $this->sql_type = OCP\Config::getAppValue('user_sql', 'sql_type', '');
+            $this->default_domain = OCP\Config::getAppValue('user_sql', 'default_domain', '');
+            $this->strip_domain = OCP\Config::getAppValue('user_sql', 'strip_domain', 0);
             $dsn = $this->sql_type.":host=".$this->sql_host.";dbname=".$this->sql_database;
             try 
             {
                 $this->db = new PDO($dsn, $this->sql_username, $this->sql_password);
                 $this->db_conn = true;
             }
             catch (PDOException $e) 
             {
                 OC_Log::write('OC_USER_SQL', 'OC_USER_SQL, Failed to connect to the database: ' . $e->getMessage(), OC_Log::ERROR);
             }
             return false;
         }
 
 	    public function implementsAction($actions) 
 	    {
 		    return (bool)((OC_USER_BACKEND_CHECK_PASSWORD) & $actions);
 	    }
 
 	    public function createUser() {
             // Can't create user
             OC_Log::write('OC_USER_SQL', 'Not possible to create local users from web frontend using SQL user backend', OC_Log::ERROR);
             return false;
         }
 
         public function deleteUser( $uid ) 
         {
             // Can't delete user
             OC_Log::write('OC_USER_SQL', 'Not possible to delete local users from web frontend using SQL user backend', OC_Log::ERROR);
             return false;
         }
 
         public function setPassword ( $uid, $password ) {
             // Update the user's password - this might affect other services, that user the same database, as well
             if(!$this->db_conn)
             {
                 return false;
             }
-            
+            if($this->strip_domain)
+            {
+                $uid .= "@".$this->default_domain;
+            }
             $query = "UPDATE $this->sql_table SET $this->sql_column_password = ENCRYPT('$password') WHERE $this->sql_column_username = '$uid'";
             $result = $this->db->prepare($query);
             if(!$result->execute())
             {
                 return false;
             }
             return true;
         }
 
        /**
         * @brief Check if the password is correct
         * @param $uid The username
         * @param $password The password
         * @returns true/false
         *
         * Check if the password is correct without logging in the user
         */
        public function checkPassword($uid, $password)
        {
             if(!$this->db_conn)
             {
                 return false;
             }
+            $suid = $uid;
+            if($this->strip_domain)
+            {
+                $suid = $uid."@".$this->default_domain;
+            }
             
-		    $query = "SELECT $this->sql_column_username, $this->sql_column_password FROM $this->sql_table WHERE $this->sql_column_username = '$uid'";
+		    $query = "SELECT $this->sql_column_username, $this->sql_column_password FROM $this->sql_table WHERE $this->sql_column_username = '$suid'";
 		    if($this->sql_column_active != '')
 		        $query .= " AND $this->sql_column_active = 1";
 		    $result = $this->db->prepare($query);
 		    if(!$result->execute())
 		    {
 		        return false;
 		    }
 		    $row = $result->fetch();
 		    if(!$row)
 		    {
 		        return false;
 		    }
 		    if(crypt($password, $row[$this->sql_column_password]) == $row[$this->sql_column_password])
 		    {
 		        return $uid;
 		    }
 		    else
 		    {
 		        return false;
 		    }
        }
 
        /**
         * @brief Get a list of all users
         * @returns array with all uids
         *
         * Get a list of all users.
         */
 
        public function getUsers($search = '', $limit = null, $offset = null)
        {
            $users = array();
            if(!$this->db_conn)
            {
             return false;
            }
 		   $query = "SELECT $this->sql_column_username FROM $this->sql_table";
 		   if($search != '')
 		      $query .= " WHERE $this->sql_column_username LIKE '%$search%'";
 		    if($this->sql_column_active != '')
 		    {
 		        if($search != '')
 		            $query .= " AND";
 		        else
 		            $query .= " WHERE";
 		        $query .= " $this->sql_column_active = 1";
 		    }
 		   if($limit != null)
 		      $query .= " LIMIT $limit";
 		   if($offset != null)
 		      $query .= " OFFSET $offset";
 		   $result = $this->db->prepare($query);
 		   if(!$result->execute())
 		   {
 		    return array();
 		   }
 		   while($row = $result->fetch())
 		   {
-		       $users[] = $row[$this->sql_column_username];
+		       $uid = $row[$this->sql_column_username];
+		       if($this->strip_domain)
+		       {
+		           $uid = explode("@", $uid);
+		           $uid = $uid[0];
+		       }
+		       $users[] = $uid;
 		   }
            return $users;
        }
 
        /**
         * @brief check if a user exists
         * @param string $uid the username
         * @return boolean
         */
 
        public function userExists($uid)
        {
             if(!$this->db_conn)
             {
                 return false;
             }
             
+	        if($this->strip_domain)
+	        {
+	            $uid .= "@".$this->default_domain;
+	        }            
+            
 		    $query = "SELECT $this->sql_column_username FROM $this->sql_table WHERE $this->sql_column_username = '$uid'";
   		    if($this->sql_column_active != '')
 		        $query .= " AND $this->sql_column_active = 1";
 		    $result = $this->db->prepare($query);
 		    if(!$result->execute())
 		    {
 		        return false;
 		    }
             $row = $result->fetch();
             if(!$row)
             {
 		        return false;
             }
             else
             {
                 return true;
             }
 
        }
 
 }
 
 ?>