diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php
index cdd7bfe64..70c412096 100644
--- a/e107_handlers/user_handler.php
+++ b/e107_handlers/user_handler.php
@@ -213,8 +213,9 @@ class UserHandler
 	 */
 	public function CheckPassword($password, $login_name, $stored_hash)
 	{
+		$password = trim($password);
 
-		if(empty(trim($password)))
+		if(empty($password))
 		{
 			return PASSWORD_INVALID;
 		}