diff --git a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
index 80db4ff7..448b577b 100644
--- a/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
+++ b/src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl
@@ -35,8 +35,8 @@
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
                         <#attempt>
-                            <#if '${fieldName}' == 'username' || '${fieldName}' == 'password'>
-                                return <#if messagesPerField.exists('username') ||  messagesPerField.exists('password')>x<#else>undefined</#if>;
+                            <#if ('${fieldName}' == 'username' || '${fieldName}' == 'password') && messagesPerField.existsError('username', 'password')>
+                                    return x;
                             <#else>
                                 return <#if messagesPerField.exists('${fieldName}')>x<#else>undefined</#if>;
                             </#if>