diff --git a/functions/passwd.cpp b/functions/passwd.cpp
index 0538a9f..60e6209 100755
--- a/functions/passwd.cpp
+++ b/functions/passwd.cpp
@@ -113,10 +113,10 @@ long user_id;
 		return;
 	}
 
-	if( !IsPasswordCorrect(pass_new, pass_conf) )
+	if( !IsPasswordCorrect(pass_new, pass_conf, true) )
 		return;
 
-	if( ChangePassword(cur->session->puser->id, pass_new) )
+	if( ChangePassword(puser->id, pass_new) )
 	{
 		slog << loginfo << T("passwd_password_changed") << logend;
 		system->RedirectToLastItem();