diff --git a/htdocs/lib/User.php b/htdocs/lib/User.php
index f461402..2f81749 100644
--- a/htdocs/lib/User.php
+++ b/htdocs/lib/User.php
@@ -139,7 +139,7 @@ class User
 	 */
 	public static function getByEmail($email)
 	{
-		$query = kl_str_sql('SELECT * FROM users WHERE cust_id!=1 AND email=!s', $email);
+		$query = kl_str_sql('SELECT * FROM users WHERE email=!s', $email);
 		if (!$res = DBH::$db->query($query) OR !$row = DBH::$db->fetchRow($res)) {
 			return false;
 		} else {
diff --git a/htdocs/process_login.php b/htdocs/process_login.php
index 78e2c91..88c5cb3 100644
--- a/htdocs/process_login.php
+++ b/htdocs/process_login.php
@@ -14,6 +14,18 @@ $user_email = GoogleLogin::userEmail();
 
 $user = User::getByLogin($user_identity);
 
+if (!$user)
+{
+	var_dump($user_email);
+	$user_tmp = User::getByEmail($user_email);
+	if($user_tmp /* && (!$user->login) || ($user->login == "")*/)
+	{
+		$user = $user_tmp;
+		$user->login = $user_identity;
+		$user->update();
+	}
+}
+
 if (!$user)
 {
     $user = new User();