diff --git a/e107_admin/auth.php b/e107_admin/auth.php
index 7ea788986..fe7cf15fd 100644
--- a/e107_admin/auth.php
+++ b/e107_admin/auth.php
@@ -143,6 +143,7 @@ else
 		}
 
 	//	require_once (e_HANDLER.'user_handler.php');
+		/** @var array $row */
 		$row = $authresult = $obj->authcheck($_POST['authname'], $_POST['authpass'], varset($_POST['hashchallenge'], ''));
 
 		if ($row[0] == "authfail")
@@ -155,6 +156,14 @@ else
 		}
 		else
 		{
+
+			$reHashedPass = e107::getUserSession()->rehashPassword($row,$_POST['authpass']);
+			if($reHashedPass !==false)
+			{
+				e107::getLog()->add('ADMINPW_02', '', E_LOG_INFORMATIVE, '', LOG_TO_ADMIN, $row);
+				$row['user_password'] = $reHashedPass;
+			}
+
 			$cookieval = $row['user_id'].".".md5($row['user_password']);
 
 			//	  $sql->db_Select("user", "*", "user_name='".$tp -> toDB($_POST['authname'])."'");
@@ -197,6 +206,9 @@ else
 			// ---
 			
 			e107::getEvent()->trigger("login", $edata_li);
+
+
+
 			e107::getRedirect()->redirect(e_ADMIN_ABS.'admin.php');
 			//echo "<script type='text/javascript'>document.location.href='admin.php'</script>\n";
 		}
diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php
index 84f41f56a..99e720705 100644
--- a/e107_handlers/user_handler.php
+++ b/e107_handlers/user_handler.php
@@ -304,7 +304,7 @@ class UserHandler
 	 * If necessary, rehash the user password to the currently set algorythm and updated database. .
 	 * @param array $user - user fields. required: user_id, user_loginname, user_password
 	 * @param string $password - plain text password.
-	 * @return bool|str returns new password hash on success or false.
+	 * @return bool|string returns new password hash on success or false.
 	 */
 	public function rehashPassword($user, $password)
 	{
diff --git a/e107_languages/English/admin/lan_log_messages.php b/e107_languages/English/admin/lan_log_messages.php
index 2de894fb8..1246a6d87 100644
--- a/e107_languages/English/admin/lan_log_messages.php
+++ b/e107_languages/English/admin/lan_log_messages.php
@@ -213,7 +213,7 @@ define("LAN_AL_WELCOME_05", "");
 // Admin Password
 //---------------
 define("LAN_AL_ADMINPW_01", "Admin password changed");
-
+define("LAN_AL_ADMINPW_02", "Admin password rehashed");
 
 // Banners Admin
 //--------------