diff --git a/.gitignore b/.gitignore
index 6ab01048..57451200 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,5 @@ jspm_packages
 
 /sample_react_project/
 /.yarn_home/
+
+.idea
diff --git a/src/bin/build-keycloak-theme/generateFtl/common.ftl b/src/bin/build-keycloak-theme/generateFtl/common.ftl
index 5323e896..b7f70c5d 100644
--- a/src/bin/build-keycloak-theme/generateFtl/common.ftl
+++ b/src/bin/build-keycloak-theme/generateFtl/common.ftl
@@ -1,7 +1,6 @@
-<script>const _= 
-<#macro objectToJson_please_ignore_errors object depth>
+<script>const _=
+<#macro objectToJson_please_ignore_errors object depth arr ftl>
     <@compress>
-
         <#local isHash = false>
         <#attempt>
             <#local isHash = object?is_hash || object?is_hash_ex>
@@ -11,9 +10,7 @@
             <#return>
         </#attempt>
         <#if isHash>
-
             <#local keys = "">
-
             <#attempt>
                 <#local keys = object?keys>
             <#recover>
@@ -21,41 +18,42 @@
                 undefined
                 <#return>
             </#attempt>
-
+            <#if arr?sequence?size gte 1>
+                <#local keys = arr>
+            </#if>
             {${'\n'}
-
             <#list keys as key>
-
                 <#if key == "class">
                     /* skipping "class" property of object */
                     <#continue>
                 </#if>
-
-                <#local value = "">
-
                 <#attempt>
-                    <#local value = object[key]>
+                    <#local value = object[key]!"error_data_is_undefined">
                 <#recover>
                     /* couldn't dereference ${key} of object */
                     <#continue>
                 </#attempt>
-
                 <#if depth gt 7>
                     /* Avoid calling recustively too many times depth: ${depth}, key: ${key} */
                     <#continue>
                 </#if>
-
-                "${key}": <@objectToJson_please_ignore_errors object=value depth=depth+1/>,
-
+                <#local arr_keys = []>
+                <#if depth==0 && key=="url" && ftl=="saml-post-form.ftl" >
+                    <#local arr_keys = ["resourcesPath", "resourcesCommonPath", "loginRestartFlowUrl", "loginUrl", "loginResetCredentialsUrl", "registrationUrl", "registrationAction", "oauth2DeviceVerificationAction", "oauthAction", "loginResetCredentialsUrl"]>
+                <#elseif depth==0 && key=="url">
+                    <#local arr_keys = ["loginAction", "resourcesPath", "resourcesCommonPath", "loginRestartFlowUrl", "loginUrl", "loginResetCredentialsUrl", "registrationUrl", "registrationAction", "oauth2DeviceVerificationAction", "oauthAction", "loginResetCredentialsUrl"]>
+                </#if>
+                <#if depth==0 && key=="auth" && ftl=="login-reset-password.ftl" >
+                    <#local arr_keys = ["showUsername", "showResetCredentials", "showTryAnotherWayLink", "attemptedUsername"]>
+                <#elseif depth==0 && key=="auth">
+                    <#local arr_keys = ["showUsername", "showResetCredentials", "showTryAnotherWayLink"]>
+                </#if>
+                <#if depth==0 && key=="updateProfileCtx" ><#continue></#if>
+                "${key}": <@objectToJson_please_ignore_errors object=value depth=depth+1 arr=arr_keys ftl=ftl />,
             </#list>
-
             }${'\n'}
-
             <#return>
-
         </#if>
-
-
         <#local isMethod = "">
         <#attempt>
             <#local isMethod = object?is_method>
@@ -64,14 +62,10 @@
             undefined
             <#return>
         </#attempt>
-
         <#if isMethod>
             undefined
             <#return>
         </#if>
-
-
-
         <#local isBoolean = "">
         <#attempt>
             <#local isBoolean = object?is_boolean>
@@ -80,13 +74,10 @@
             undefined
             <#return>
         </#attempt>
-
         <#if isBoolean>
             ${object?c}
             <#return>
         </#if>
-
-
         <#local isEnumerable = "">
         <#attempt>
             <#local isEnumerable = object?is_enumerable>
@@ -95,23 +86,14 @@
             undefined
             <#return>
         </#attempt>
-
         <#if isEnumerable>
-
             [${'\n'}
-
             <#list object as item>
-
-                <@objectToJson_please_ignore_errors object=item depth=depth+1/>,
-
+                <@objectToJson_please_ignore_errors object=item depth=depth+1 arr=[] ftl=ftl/>,
             </#list>
-
             ]${'\n'}
-
             <#return>
         </#if>
-
-
         <#attempt>
             "${object?replace('"', '\\"')?no_esc}"
         <#recover>
@@ -119,25 +101,21 @@
             undefined;
             <#return>
         </#attempt>
-
-
     </@compress>
 </#macro>
-
 (()=>{
-
-    const nonAutomaticallyConvertible = { 
+    const nonAutomaticallyConvertible = {
         "messagesPerField": {
-
-            <#assign fieldNames = ["global", "userLabel", "username", "email", "firstName", "lastName", "password", "password-confirm"]>
-
+            <#assign fieldNames = ["global", "userLabel", "username", "email", "firstName", "lastName", "password", "password-confirm", "totp", "totpSecret", "SAMLRequest", "SAMLResponse", "relayState", "device_user_code", "code", "password-new", "rememberMe", "login", "authenticationExecution", "cancel-aia", "clientDataJSON", "authenticatorData", "signature", "credentialId", "userHandle", "error", "authn_use_chk", "authenticationExecution", "isSetRetry", "try-again", "attestationObject", "publicKeyCredentialId", "authenticatorLabel"]>
+            <#assign attributes = (profile.attributes)![]>
             <#attempt>
-                <#list profile.attributes as attribute>
-                    <#assign fieldNames += [attribute.name]>
+                <#list attributes as attribute>
+                    <#if (attribute.name)??>
+                        <#assign fieldNames += [attribute.name]>
+                    </#if>
                 </#list>
             <#recover>
             </#attempt>
-
             "printIfExists": function (fieldName, x) {
                 <#list fieldNames as fieldName>
                     if(fieldName === "${fieldName}" ){
@@ -185,24 +163,19 @@
                 throw new Error("There is no " + fieldName + " field");
             }
         },
-        "msg": function(){ throw new Error("use import { useKcMessage } from 'keycloakify'"); },
-        "advancedMsg": function(){ throw new Error("use import { useKcMessage } from 'keycloakify'"); }
+        "msg": function(){ throw new Error("use import { useKcMessage } from 'keycloakify'"); },
+        "advancedMsg": function(){ throw new Error("use import { useKcMessage } from 'keycloakify'"); }
     };
-
     const out = {};
-
     Object.deepAssign(
         out,
         //Removing all the undefined
-        JSON.parse(JSON.stringify(<@objectToJson_please_ignore_errors object=.data_model depth=0 />))
+        JSON.parse(JSON.stringify(<@objectToJson_please_ignore_errors object=.data_model depth=0 arr=[] ftl="ftl_template_for_replacement" />), (key, value) => value === "error_data_is_undefined" ? undefined : value)
     );
-
     Object.deepAssign(
         out,
         nonAutomaticallyConvertible
     );
-
     return out;
-
 })()
 </script>
\ No newline at end of file
diff --git a/src/bin/build-keycloak-theme/generateFtl/generateFtl.ts b/src/bin/build-keycloak-theme/generateFtl/generateFtl.ts
index ab417140..36bd7eac 100644
--- a/src/bin/build-keycloak-theme/generateFtl/generateFtl.ts
+++ b/src/bin/build-keycloak-theme/generateFtl/generateFtl.ts
@@ -141,7 +141,9 @@ export function generateFtlFilesCodeFactory(params: {
             ].join("\n"),
         );
 
-        objectKeys(ftlPlaceholders).forEach(id => (ftlCode = ftlCode.replace(id, ftlPlaceholders[id])));
+        objectKeys(ftlPlaceholders).forEach(
+            id => (ftlCode = ftlCode.replace(id, ftlPlaceholders[id]).replace("ftl_template_for_replacement", pageId)),
+        );
 
         return { ftlCode };
     }