diff --git a/application/loginwebpage.class.inc.php b/application/loginwebpage.class.inc.php
index b1fef599c..d834b7317 100644
--- a/application/loginwebpage.class.inc.php
+++ b/application/loginwebpage.class.inc.php
@@ -267,6 +267,7 @@ class LoginWebPage extends NiceWebPage
 		else
 		{
 			$aVars['bNoUser'] = false;
+			$aVars['sUserName'] = $oUser->GetFriendlyName();
 			$oEncryptedToken = $oUser->Get('reset_pwd_token');
 
 			if (!$oEncryptedToken->CheckPassword($sToken))
@@ -276,7 +277,6 @@ class LoginWebPage extends NiceWebPage
 			else
 			{
 				$aVars['bBadToken'] = false;
-				$aVars['sUserName'] = $oUser->GetFriendlyName();
 			}
 		}
 
diff --git a/templates/login/password/resetpwdform.html.twig b/templates/login/password/resetpwdform.html.twig
index bf18e24c6..7b1eb9904 100644
--- a/templates/login/password/resetpwdform.html.twig
+++ b/templates/login/password/resetpwdform.html.twig
@@ -12,10 +12,13 @@
 			{% elseif bBadToken and sErrorMessage is null %}
 				<p>{{ 'UI:ResetPwd-Error-InvalidToken'|dict_s }}</p>
 			{% else %}
+				{% if sUserName is not empty %}
+					<p>{{ 'UI:ResetPwd-Error-EnterPassword'|dict_format(sUserName) }}</p>
+				{% endif %}
+
 				{% if sErrorMessage is not null %}
 					<p class="hilite">{{ sErrorMessage|raw }}</p>
 				{% endif %}
-				<p>{{ 'UI:ResetPwd-Error-EnterPassword'|dict_format(sUserName) }}</p>
 			</div>
 			<div id="login-form">
 					<form method="post">