diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 7ba847bb3..7ea788986 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -420,18 +420,13 @@ class auth
 
 		if (!$reason)
 		{
-			if ($sql_auth->db_Select("user", "*", "user_loginname='{$authname}' AND user_admin='1' "))
+			if ($sql_auth->select("user", "*", "user_loginname='{$authname}' AND user_admin = 1 "))
 			{
-				$row = $sql_auth->db_Fetch();
+				$row = $sql_auth->fetch();
 			}
-			elseif ($sql_auth->db_Select("user", "*", "user_name='{$authname}' AND user_admin='1' "))
+			elseif ($sql_auth->select("user", "*", "(user_name='{$authname}' OR user_email='{$authname}' ) AND user_admin=1 "))
 			{
-				$row = $sql_auth->db_Fetch();
-				$authname = $row['user_loginname'];
-			}
-			elseif ($sql_auth->db_Select("user", "*", "user_email='{$authname}' AND user_admin='1' "))
-			{
-				$row = $sql_auth->db_Fetch();
+				$row = $sql_auth->fetch();
 				$authname = $row['user_loginname'];
 			}
 			else
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 97fb4ef75..c4757cf7b 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -6926,7 +6926,7 @@ class e_form
 				{
 
 					$required = $this->getRequiredString();
-					$required_class = ' class="required-label" title="'.LAN_REQUIRED.'"'; 
+					$required_class = ' class="required-label" title="'.LAN_REQUIRED.'"';
 					$required_help = true;
 
 					if(!empty($att['validate']))