diff --git a/webapp/languages/es_GO/i18n/all_es_GO.properties b/webapp/languages/es_GO/i18n/all_es_GO.properties
index 9f9b3ca3b..241a38e43 100644
--- a/webapp/languages/es_GO/i18n/all_es_GO.properties
+++ b/webapp/languages/es_GO/i18n/all_es_GO.properties
@@ -87,7 +87,7 @@ reset_password = Restablecer contraseña
 reset_password_note = Nota: Las instrucciones para restablecer la contraseña serán enviados por correo electrónico a la dirección indicada anteriormente. La contraseña no se restablecerá hasta que el usuario sigue el enlace que aparece en este correo electrónico.
 new_password = Nueva contraseña
 confirm_password = Confirmar nueva contraseña
-minimum_password_length = Mínimo de {0} caracteres de longitud.
+minimum_password_length = Mínimo de {0} caracteres de longitud; maximo de {1}.
 leave_password_unchanged = Dejando esto en blanco significa que no se puede cambiar la contraseña.
 confirm_initial_password = Confirmar contraseña inicial
 
diff --git a/webapp/web/i18n/all.properties b/webapp/web/i18n/all.properties
index 3d8be28c8..d0c89c9a5 100644
--- a/webapp/web/i18n/all.properties
+++ b/webapp/web/i18n/all.properties
@@ -90,7 +90,7 @@ be emailed to the address entered above. The password will not \
 be reset until the user follows the link provided in this email.
 new_password = New password
 confirm_password = Confirm new password
-minimum_password_length = Minimum of {0} characters in length.
+minimum_password_length = Minimum of {0} characters in length; maximum of {1}.
 leave_password_unchanged = Leaving this blank means that the password will not be changed.
 confirm_initial_password = Confirm initial password
 
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
index 0a80aa63c..7cf83ee61 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
@@ -31,7 +31,7 @@
         <label for="new-password">${strings.new_password}<span class="requiredHint"> *</span></label>
         <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
         
-        <p class="note">${strings.minimum_password_length(minimumLength)}</p>
+        <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}</p>
 
         <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
         <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />