diff --git a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties
index adec83f19c63..a8416a49343d 100644
--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties
@@ -677,7 +677,7 @@ platform.core.profile.passwd.reenterPassword=Reenter password
 platform.core.profile.passwd.submit=Save
 platform.core.profile.passwd.cancel=Cancel and return to profile
 platform.core.profile.passwd.passwordMissmatch=The two passwords do not match.
-platform.core.profile.passwd.invalidOriginalPassword=Current password is invalid.
+platform.core.profile.passwd.invalidOriginalPassword=The field "Current password" was incorrect.
 platform.core.profile.passwd.passwordTooShort=Your new password should be at least 6 characters long.
 platform.core.profile.passwd.passwordCannotBeEmpty=The password cannot be empty.
 platform.core.profile.passwd.notAllowed=You are not allowed to perform this action.
diff --git a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/passwd.vm b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/passwd.vm
index 16bf66a2af31..6ec5712dbdeb 100644
--- a/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/passwd.vm
+++ b/xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/passwd.vm
@@ -70,7 +70,6 @@
         #else
           #set ($passwordLength = $passwordOptions.passwordLength)
         #end
-        $services.localization.render('platform.core.profile.passwd.instructionsPasswordLength', $passwordLength)
         ## We won't ask for the original password if the user is admin and not updating his own profile.
         ## In all other cases, we ask for it.
         #if (!$hasAdmin || $isCurrentUsersProfile)
@@ -102,12 +101,13 @@
         ## This key fits better.
         #set ($fields[$index].label = $services.localization.render('xe.admin.passwordReset.step2.newPasswordVerification.label'))
         <form class="xform third" action="" method="post" autocomplete="off">
+        ## Async validation feedback
+        #if ($request.xwikipassword && !$isValidPassword)
+            #error($stringtool.join($errorMessage, "<br/>"))
+        #end
         ## CSRF prevention
         <div class="hidden"><input type="hidden" name="form_token" value="$!{services.csrf.getToken()}" /></div>
         #generateHtml($fields, $NULL)
-        #if ($request.xwikipassword && !$isValidPassword)
-          <span class='box errormessage'>$stringtool.join($errorMessage, "<br/>")</span>
-        #end
         <div class="padded buttons">
           <span class="buttonwrapper"><input type="submit" value="$services.localization.render('platform.core.profile.passwd.submit')" class="button"/></span>
           <span class="buttonwrapper"><a href="$doc.getURL("view")" class="secondary button">$services.localization.render('platform.core.profile.passwd.cancel')</a></span>