diff --git a/classes/lnAuth/Auth/ORM.php b/classes/lnAuth/Auth/ORM.php
index 2a00081..ee33885 100644
--- a/classes/lnAuth/Auth/ORM.php
+++ b/classes/lnAuth/Auth/ORM.php
@@ -96,12 +96,29 @@ abstract class lnAuth_Auth_ORM extends lnApp_Auth_ORM {
 				return FALSE;
 		}
 
-		// Create a hashed password
-		if (is_string($password))
-			$password = $this->hash($password);
+		// Convert user password to new hash method
+		if (is_string($password) AND ! password_verify($password,$user->password) AND ! in_array($this->_config['hash_method'],['md5','sha1'])) {
+			// Was MD5
+			if (
+				(md5($password) == $user->password) OR
+				(sha1($password) == $user->password)
+			) {
+				// It will be re-hased by ORM
+				$user->password = $password;
+
+				if (! $user->save())
+					throw HTTP_Exception::factory(501,'Error converting password for :user',array(':user'=>$user->name()));
+				else {
+					SystemMessage::factory()
+						->title('Password Update')
+						->type('info')
+						->body('Your password was updated to a more secure algorithm');
+				}
+			}
+		}
 
 		// If the passwords match, perform a login
-		if ($user->active AND $user->has_any('group',ORM::factory('Group',array('name'=>'Registered Users'))->list_childgrps(TRUE)) AND $user->password === $password) {
+		if ($user->active AND $user->has_any('group',ORM::factory('Group',array('name'=>'Registered Users'))->list_childgrps(TRUE)) AND password_verify($password,$user->password)) {
 
 			// @todo This is not currently used.
 			if ($remember === TRUE) {