Merge branch 'dev'

common/models/LoginForm.php

@@ -121,7 +121,7 @@ class LoginForm extends Model
     public function getUser() 
     {
         if ($this->_user === false) {
-            $this->_user = User::findByEmail($this->email);
+            $this->_user = User::findOne(['email' => $this->email, 'type' => User::TYPE_INDIVIDUAL]);
         }
 
         return $this->_user;