diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/etc/nevis/k8s-nevisauth-ac27dd7daad0ca2b7229bfaf.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/etc/nevis/k8s-nevisauth-ac27dd7daad0ca2b7229bfaf.yaml
index 4b7e99c..6495fbc 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/etc/nevis/k8s-nevisauth-ac27dd7daad0ca2b7229bfaf.yaml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/etc/nevis/k8s-nevisauth-ac27dd7daad0ca2b7229bfaf.yaml
@@ -27,20 +27,25 @@ spec:
   livenessProbe:
     soap:
       tcpSocket: true
-      initialDelaySeconds: 40
-      periodSeconds: 20
+      periodSeconds: 5
       timeoutSeconds: 4
   readinessProbe:
     management:
       httpGet:
         path: "/nevisauth/liveness"
-      initialDelaySeconds: 40
-      periodSeconds: 30
+      periodSeconds: 5
       timeoutSeconds: 6
+  startupProbe:
+    management:
+      httpGet:
+        path: "/nevisauth/liveness"
+      periodSeconds: 5
+      timeoutSeconds: 6
+      failureThreshold: 50
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-c8a2ac2ea6277d4f605767f8eb567015feac6dec"
+    tag: "r-937b0c071785a44df35dbbfe5a32b4cd60dc6198"
     dir: "DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth"
     credentials: "git-credentials"
   keystores:
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/env.conf b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/env.conf
index ec91f54..000317d 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/env.conf
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/env.conf
@@ -1,8 +1,8 @@
 RTENV_SECURITY_CHECK=no_shell
 
 JAVA_OPTS=(
-    "-Dfile.encoding=UTF-8"
     "-XX:+UseContainerSupport"
+    "-Dfile.encoding=UTF-8"
     "-XX:MaxRAMPercentage=80.0"
     "-Djava.net.preferIPv4Stack=true"
     "-Djava.net.connectionTimeout=10000"
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/otel.properties b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/otel.properties
index db61b17..87fd6ba 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/otel.properties
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/auth/var/opt/nevisauth/default/conf/otel.properties
@@ -1,4 +1,4 @@
-otel.service.name=auth
-otel.traces.exporter=none
-otel.metrics.exporter=none
-otel.logs.exporter=none
+otel.service.name = auth
+otel.traces.exporter = none
+otel.metrics.exporter = none
+otel.logs.exporter = none
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/etc/nevis/k8s-nevisidm-batch-641ac4edf0c17383d3c0ea38.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/etc/nevis/k8s-nevisidm-batch-641ac4edf0c17383d3c0ea38.yaml
index 2f628f0..ee6d7ac 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/etc/nevis/k8s-nevisidm-batch-641ac4edf0c17383d3c0ea38.yaml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/etc/nevis/k8s-nevisidm-batch-641ac4edf0c17383d3c0ea38.yaml
@@ -28,20 +28,25 @@ spec:
     management:
       httpGet:
         path: "/liveness"
-      initialDelaySeconds: 40
       periodSeconds: 30
       timeoutSeconds: 6
   readinessProbe:
     management:
       httpGet:
         path: "/health"
-      initialDelaySeconds: 40
       periodSeconds: 30
       timeoutSeconds: 6
+  startupProbe:
+    management:
+      httpGet:
+        path: "/health"
+      periodSeconds: 30
+      timeoutSeconds: 6
+      failureThreshold: 10
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-c8a2ac2ea6277d4f605767f8eb567015feac6dec"
+    tag: "r-937b0c071785a44df35dbbfe5a32b4cd60dc6198"
     dir: "DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job"
     credentials: "git-credentials"
   keystores:
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/env.conf b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/env.conf
index 84186f1..13dfb9b 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/env.conf
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/env.conf
@@ -1 +1,8 @@
-JAVA_OPTS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=80.0 -javaagent:/opt/agent/opentelemetry-javaagent.jar -Dotel.javaagent.logging=application -Dotel.javaagent.configuration-file=/var/opt/nevisidm/default/conf/otel.properties -Dotel.resource.attributes=service.version=8.2405.1,service.instance.id=$HOSTNAME"
\ No newline at end of file
+JAVA_OPTS=(
+    "-XX:+UseContainerSupport"
+    "-XX:MaxRAMPercentage=80.0"
+    "-javaagent:/opt/agent/opentelemetry-javaagent.jar"
+    "-Dotel.javaagent.logging=application"
+    "-Dotel.javaagent.configuration-file=/var/opt/nevisidm/default/conf/otel.properties"
+    "-Dotel.resource.attributes=service.version=8.2405.1,service.instance.id=$HOSTNAME"
+)
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/nevisidm-prod.properties b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/nevisidm-prod.properties
index 778416a..bd79333 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/nevisidm-prod.properties
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/nevisidm-prod.properties
@@ -93,6 +93,8 @@ server.host=0.0.0.0
 # source: pattern://641ac4edf0c17383d3c0ea38
 server.tls.enabled=true
 # source: pattern://641ac4edf0c17383d3c0ea38
+server.tls.client-auth=requested
+# source: pattern://641ac4edf0c17383d3c0ea38
 server.tls.keystore=/var/opt/keys/own/idm-job-default-identity/keystore.p12
 # source: pattern://641ac4edf0c17383d3c0ea38
 server.tls.keystore-passphrase=${exec:/var/opt/keys/own/idm-job-default-identity/keypass}
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/otel.properties b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/otel.properties
index a375819..af78f34 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/otel.properties
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm-job/var/opt/nevisidm/default/conf/otel.properties
@@ -1,4 +1,4 @@
-otel.service.name=idm-job
-otel.traces.exporter=none
-otel.metrics.exporter=none
-otel.logs.exporter=none
+otel.service.name = idm-job
+otel.traces.exporter = none
+otel.metrics.exporter = none
+otel.logs.exporter = none
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-nevisidm-admin-ba7c7a3b091df0c4b8ba0bb2.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-nevisidm-admin-ba7c7a3b091df0c4b8ba0bb2.yaml
index 52275d0..2565bb9 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-nevisidm-admin-ba7c7a3b091df0c4b8ba0bb2.yaml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/etc/nevis/k8s-nevisidm-admin-ba7c7a3b091df0c4b8ba0bb2.yaml
@@ -28,20 +28,25 @@ spec:
     management:
       httpGet:
         path: "/liveness"
-      initialDelaySeconds: 40
       periodSeconds: 30
       timeoutSeconds: 6
   readinessProbe:
     management:
       httpGet:
         path: "/health"
-      initialDelaySeconds: 40
       periodSeconds: 30
       timeoutSeconds: 6
+  startupProbe:
+    management:
+      httpGet:
+        path: "/health"
+      periodSeconds: 30
+      timeoutSeconds: 6
+      failureThreshold: 10
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-c8a2ac2ea6277d4f605767f8eb567015feac6dec"
+    tag: "r-937b0c071785a44df35dbbfe5a32b4cd60dc6198"
     dir: "DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm"
     credentials: "git-credentials"
   database:
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/env.conf b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/env.conf
index 84186f1..13dfb9b 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/env.conf
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/env.conf
@@ -1 +1,8 @@
-JAVA_OPTS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=80.0 -javaagent:/opt/agent/opentelemetry-javaagent.jar -Dotel.javaagent.logging=application -Dotel.javaagent.configuration-file=/var/opt/nevisidm/default/conf/otel.properties -Dotel.resource.attributes=service.version=8.2405.1,service.instance.id=$HOSTNAME"
\ No newline at end of file
+JAVA_OPTS=(
+    "-XX:+UseContainerSupport"
+    "-XX:MaxRAMPercentage=80.0"
+    "-javaagent:/opt/agent/opentelemetry-javaagent.jar"
+    "-Dotel.javaagent.logging=application"
+    "-Dotel.javaagent.configuration-file=/var/opt/nevisidm/default/conf/otel.properties"
+    "-Dotel.resource.attributes=service.version=8.2405.1,service.instance.id=$HOSTNAME"
+)
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_additionalAddress.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_additionaladdress.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_additionalAddress.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_additionaladdress.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingFri.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingfri.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingFri.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingfri.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingHol.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openinghol.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingHol.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openinghol.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingMon.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingmon.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingMon.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingmon.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingRemarksDe.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingremarksde.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingRemarksDe.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingremarksde.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingRemarksEn.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingremarksen.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingRemarksEn.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingremarksen.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingRemarksFr.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingremarksfr.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingRemarksFr.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingremarksfr.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingRemarksIt.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingremarksit.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingRemarksIt.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingremarksit.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingSat.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingsat.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingSat.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingsat.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingThu.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingthu.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingThu.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingthu.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingTue.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingtue.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingTue.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingtue.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingWed.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingwed.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_openingWed.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_openingwed.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_position.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_position.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_position.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_position.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_street.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_street.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_street.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_street.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_town.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_town.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_town.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/unit_nevisidm_custom_property_counter_town.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_agovId.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_agovid.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_agovId.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_agovid.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_counterExtId.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_counter_counterextid.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_counter_counterExtId.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_counter_counterextid.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_eIdNumber.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_eidnumber.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_eIdNumber.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_eidnumber.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_eIdNumber_agovs.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_eidnumber_agovs.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_eIdNumber_agovs.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_eidnumber_agovs.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_nationality.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_nationality.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_nationality.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_nationality.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_nationality_agovs.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_nationality_agovs.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_nationality_agovs.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_nationality_agovs.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_placeOfBirth.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_placeofbirth.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_placeOfBirth.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_placeofbirth.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_placeOfBirth_agovs.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_placeofbirth_agovs.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_placeOfBirth_agovs.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_placeofbirth_agovs.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_svnr.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_svnr.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_svnr.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_svnr.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_svnr_agovs.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_svnr_agovs.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_svnr_agovs.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_svnr_agovs.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_verificationStatus.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_verificationstatus.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_verificationStatus.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_verificationstatus.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_verificationTransactionId.json b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_verificationtransactionid.json
similarity index 100%
rename from DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/nevisIDM_Custom_Property_verificationTransactionId.json
rename to DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/import/property/user_nevisidm_custom_property_verificationtransactionid.json
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/nevisidm-prod.properties b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/nevisidm-prod.properties
index 9c70b90..e8d9455 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/nevisidm-prod.properties
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/nevisidm-prod.properties
@@ -97,6 +97,8 @@ server.host=0.0.0.0
 # source: pattern://ba7c7a3b091df0c4b8ba0bb2
 server.tls.enabled=true
 # source: pattern://ba7c7a3b091df0c4b8ba0bb2
+server.tls.client-auth=requested
+# source: pattern://ba7c7a3b091df0c4b8ba0bb2
 server.tls.keystore=/var/opt/keys/own/idm-default-identity/keystore.p12
 # source: pattern://ba7c7a3b091df0c4b8ba0bb2
 server.tls.keystore-passphrase=${exec:/var/opt/keys/own/idm-default-identity/keypass}
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/otel.properties b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/otel.properties
index 73cea86..ae663a6 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/otel.properties
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/idm/var/opt/nevisidm/default/conf/otel.properties
@@ -1,4 +1,4 @@
-otel.service.name=idm
-otel.traces.exporter=none
-otel.metrics.exporter=none
-otel.logs.exporter=none
+otel.service.name = idm
+otel.traces.exporter = none
+otel.metrics.exporter = none
+otel.logs.exporter = none
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/etc/nevis/k8s-nevislogrend-8401da6318c6915d689cdfc9.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/etc/nevis/k8s-nevislogrend-8401da6318c6915d689cdfc9.yaml
index 721d899..38f7723 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/etc/nevis/k8s-nevislogrend-8401da6318c6915d689cdfc9.yaml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/etc/nevis/k8s-nevislogrend-8401da6318c6915d689cdfc9.yaml
@@ -28,19 +28,23 @@ spec:
     management:
       httpGet:
         path: "/nevislogrend/liveness"
-      initialDelaySeconds: 40
-      periodSeconds: 30
+      periodSeconds: 5
       timeoutSeconds: 6
   readinessProbe:
     server:
       tcpSocket: true
-      initialDelaySeconds: 40
-      periodSeconds: 20
+      periodSeconds: 5
       timeoutSeconds: 4
+  startupProbe:
+    server:
+      tcpSocket: true
+      periodSeconds: 5
+      timeoutSeconds: 4
+      failureThreshold: 50
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-c8a2ac2ea6277d4f605767f8eb567015feac6dec"
+    tag: "r-937b0c071785a44df35dbbfe5a32b4cd60dc6198"
     dir: "DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend"
     credentials: "git-credentials"
   podSecurity:
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/conf/env.conf b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/conf/env.conf
index 7c9bfaa..1e7049e 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/conf/env.conf
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/conf/env.conf
@@ -4,8 +4,8 @@ RTENV_SECURITY_CHECK=no_shell
 LOGREND_DEPLOY_TYPE=standalone
 
 JAVA_OPTS=(
-    "-Dfile.encoding=UTF-8"
     "-XX:+UseContainerSupport"
+    "-Dfile.encoding=UTF-8"
     "-XX:MaxRAMPercentage=80.0"
     "-javaagent:/opt/agent/opentelemetry-javaagent.jar"
     "-Dotel.javaagent.logging=application"
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/conf/otel.properties b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/conf/otel.properties
index 010a13d..38c0aa7 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/conf/otel.properties
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/conf/otel.properties
@@ -1,4 +1,4 @@
-otel.service.name=logrend
-otel.traces.exporter=none
-otel.metrics.exporter=none
-otel.logs.exporter=none
+otel.service.name = logrend
+otel.traces.exporter = none
+otel.metrics.exporter = none
+otel.logs.exporter = none
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/fido2_auth.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/fido2_auth.js
new file mode 100644
index 0000000..9f0def4
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/fido2_auth.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initFido'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_accessapp_auth.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_accessapp_auth.js
new file mode 100644
index 0000000..fb1ce98
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_accessapp_auth.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initQRCode'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_check_code.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_check_code.js
new file mode 100644
index 0000000..899a50a
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_check_code.js
@@ -0,0 +1,4 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initModal'));
+	document.dispatchEvent(new Event('initCode'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_code.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_code.js
new file mode 100644
index 0000000..3102c3b
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_code.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initBlurCode'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_fidokey_auth.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_fidokey_auth.js
new file mode 100644
index 0000000..9f0def4
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_fidokey_auth.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initFido'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_intro_email.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_intro_email.js
new file mode 100644
index 0000000..8f649df
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_intro_email.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initEmail'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_intro_email_sent.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_intro_email_sent.js
new file mode 100644
index 0000000..8f649df
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_intro_email_sent.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initEmail'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_questionnaire_loginfactor.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_questionnaire_loginfactor.js
new file mode 100644
index 0000000..6015e9c
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_questionnaire_loginfactor.js
@@ -0,0 +1,9 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initAnswer'));
+});
+
+// eslint-disable-next-line no-unused-vars
+function setErrorBanner(value) {
+	document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
+	document.getElementById('buttons').style.marginTop = value ? '16px' : '8px';
+}
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_questionnaire_reason_selection.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_questionnaire_reason_selection.js
new file mode 100644
index 0000000..04da7be
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/recovery_questionnaire_reason_selection.js
@@ -0,0 +1,9 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initAnswer'));
+});
+
+// eslint-disable-next-line no-unused-vars
+function setErrorBanner(value) {
+	document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
+	console.log(document.getElementById('errorBanner').style.display);
+}
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/user_input.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/user_input.js
new file mode 100644
index 0000000..8f649df
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/static/js-code/user_input.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initEmail'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/fido2_auth.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/fido2_auth.vm
index e82c4b1..d25fe13 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/fido2_auth.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/fido2_auth.vm
@@ -19,12 +19,12 @@
 			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
 				  accept-charset="UTF-8">
 				<div class="flex flex-row items-center justify-between">
-				#set ($emailInput = $gui.getGuiElem('email'))
-				#if ($emailInput && $emailInput.value && $emailInput.value.length() > 0)
-					<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate">$utils.escapeHtmlAttribute($emailInput.value)</p>
-				#else
-					<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate"></p>
-				#end
+					#set ($emailInput = $gui.getGuiElem('email'))
+					#if ($emailInput && $emailInput.value && $emailInput.value.length() > 0)
+						<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate">$utils.escapeHtmlAttribute($emailInput.value)</p>
+					#else
+						<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate"></p>
+					#end
 					<agov-button
 							class="shrink-0"
 							data-style="frameless"
@@ -52,19 +52,22 @@
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">1</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction1")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction1")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">2</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction2")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction2")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">3</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction3")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction3")</p>
 				</div>
 			</div>
 
@@ -119,10 +122,7 @@
 			 class="max-w-[350px] md:max-w-[520px] w-full md:basis-1/2 hidden dark:block dark:sm:hidden dark:md:block">
 	</div>
 </div>
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initFido'));
-	});
+<script src="${login.appDataPath}/static/js-code/fido2_auth.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/footer.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/footer.vm
index 808de73..657e72f 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/footer.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/footer.vm
@@ -3,7 +3,7 @@
 			$text.get("footer.text")
 			<a target="_blank" class='text-hyperlink dark:text-dark-hyperlink underline' href='$text.get("footer.link")'>$text.get("footer.link.label")</a>
 		</div>
-		<p>1.4.4.23-20240603T135747Z</p>
+		<p>1.5.3.51-20240709T140654Z</p>
 	</footer>
 	<script src="${login.appDataPath}/static/bundle.js"></script>
 </body>
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_accessapp_auth.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_accessapp_auth.vm
index 346fcba..87ba230 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_accessapp_auth.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_accessapp_auth.vm
@@ -15,14 +15,17 @@
 				<h2 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("general.authenticate")</h2>
 			</div>
 
-			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get("recovery_accessapp_auth.accessAppRegistered")</h3>
+			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get(
+				"recovery_accessapp_auth.accessAppRegistered")</h3>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-2">
-				${text.get("recovery_accessapp_auth.instruction1").replaceAll("!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
+				${text.get("recovery_accessapp_auth.instruction1").replaceAll(
+					"!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
 			</p>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-8">
-				${text.get("recovery_accessapp_auth.instruction2").replaceAll("!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
+				${text.get("recovery_accessapp_auth.instruction2").replaceAll(
+					"!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
 			</p>
 
 			<div id="accessAppModal" class="h-full">
@@ -55,7 +58,8 @@
 				</div>
 
 				<div class="relative flex flex-col h-full">
-					<div id="blurBackdrop" class="absolute backdrop-blur-sm top-0 bottom-0 -left-4 -right-4 z-10" style="display:none "></div>
+					<div id="blurBackdrop" class="absolute backdrop-blur-sm top-0 bottom-0 -left-4 -right-4 z-10"
+						 style="display:none "></div>
 					<div class="mobileBanner relative z-20" aria-live="assertive">
 						<div style="display: none"
 							 class="info flex rounded-xl bg-info-background dark:bg-dark-info-background items-center p-4 mb-4">
@@ -83,7 +87,8 @@
 							</p>
 						</div>
 					</div>
-					<div id="agovLoginImageMobile" style="display: none" class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full basis-1/2 mx-auto mb-4">
+					<div id="agovLoginImageMobile" style="display: none"
+						 class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full basis-1/2 mx-auto mb-4">
 						<img alt=""
 							 src="${login.appDataPath}/static/images/recovery.svg"
 							 class="block sm:hidden md:block dark:hidden w-full">
@@ -94,12 +99,14 @@
 					</div>
 					<div id="QRCodeHolder">
 						<div class="relative">
-							<canvas role="img" aria-labelledby="labelQRCodeInstructions" id="mauth_qrcode" class="mb-4 mx-auto"></canvas>
+							<canvas role="img" aria-labelledby="labelQRCodeInstructions" id="mauth_qrcode"
+									class="mb-4 mx-auto"></canvas>
 							<div class="hidden" id="QRcodeHiddenLink"></div>
 							<span id="spinner" class="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 z-20"
 								  style="display: none">
 								<img src="${login.appDataPath}/static/images/spinner.svg" class="animate-spin block dark:hidden">
-								<img src="${login.appDataPath}/static/images/spinner-dark.svg" class="animate-spin hidden dark:block">
+								<img src="${login.appDataPath}/static/images/spinner-dark.svg"
+									 class="animate-spin hidden dark:block">
 							</span>
 						</div>
 
@@ -147,7 +154,8 @@
 										data-name="EID"
 										data-value="EID"
 										data-id="EID"
-										data-label="<i class='fa-regular fa-eye align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get("mauth_usernameless.showQR")"
+										data-label="<i class='fa-regular fa-eye align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get(
+											"mauth_usernameless.showQR")"
 										data-type="button"
 										data-fullwidth="true">
 								</agov-button>
@@ -160,7 +168,8 @@
 										data-name="EID"
 										data-value="EID"
 										data-id="EID"
-										data-label="<i class='fa-regular fa-eye-slash align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get("mauth_usernameless.hideQR")"
+										data-label="<i class='fa-regular fa-eye-slash align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get(
+											"mauth_usernameless.hideQR")"
 										data-type="button"
 										data-fullwidth="true">
 								</agov-button>
@@ -179,10 +188,7 @@
 			 class="max-w-[350px] md:max-w-[520px] w-full md:basis-1/2 hidden dark:md:block">
 	</div>
 </div>
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initQRCode'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_accessapp_auth.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_check_code.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_check_code.vm
index 26843b4..22610c3 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_check_code.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_check_code.vm
@@ -13,12 +13,12 @@
 		</div>
 
 		<h4 id="modalTitle" class="font-header text-h4 text-space-blue dark:text-white mb-8">
-            $text.get("recovery_check_code.noCodeAccess")
+			$text.get("recovery_check_code.noCodeAccess")
 		</h4>
 
 		<div id="modalDescription" class="mb-20">
 			<p class="font-body text-body-l text-space-blue dark:text-white">
-                $text.get("recovery_check_code.noCodeAccessInstructions")
+				$text.get("recovery_check_code.noCodeAccessInstructions")
 			</p>
 		</div>
 
@@ -57,21 +57,21 @@
 				<h4 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("general.entryCode")</h4>
 			</div>
 
-            #set($error = $gui.getGuiElem("lasterror"))
-            #if (($error.value && $error.value != ""))
+			#set($error = $gui.getGuiElem("lasterror"))
+			#if (($error.value && $error.value != ""))
 				<div class="error flex rounded-xl bg-error-background dark:bg-dark-error-background items-center p-4 mb-6">
 					<i class="fa-regular fa-exclamation-circle rounded-full p-3 text-error dark:text-dark-error bg-error/10 dark:bg-dark-error-icon mr-4 text-xl leading-none"></i>
 					<p class="font-body text-body-l text-space-blue dark:text-white">
-                        $text.get("recovery_check_code.codeIncorrect")
+						$text.get("recovery_check_code.codeIncorrect")
 					</p>
 				</div>
-            #end
+			#end
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-2">
-                $text.get("recovery_check_code.instruction")
+				$text.get("recovery_check_code.instruction")
 			</p>
 
-            #set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
+			#set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
 			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
 				  accept-charset="UTF-8"
 				  class="flex flex-col flex-auto block ">
@@ -131,11 +131,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initModal'));
-		document.dispatchEvent(new Event('initCode'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_check_code.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_code.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_code.vm
index 40cd053..4986d26 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_code.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_code.vm
@@ -1,6 +1,7 @@
 #parse("${templatePath}/header.vm")
 #set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
-#set ($PDFRecoveryTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','').replaceAll('^(https:\/\/[^\/]+\/).*$', '$1')))
+#set ($PDFRecoveryTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','').replaceAll(
+	'^(https:\/\/[^\/]+\/).*$', '$1')))
 #set ($concat = "recovery/pdf?authToken=")
 #set ($PDFLink = "$PDFRecoveryTarget$concat$gui.getGuiElem('pdfAuthToken').value")
 
@@ -13,10 +14,12 @@
 
 			<div class="flex mb-6 items-baseline">
 				<h3 class="font-header text-h3 text-space-blue dark:text-white mr-3">$text.get("general.login")</h3>
-				<h4 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("recovery_code.newRecoveryCode")</h4>
+				<h4 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get(
+					"recovery_code.newRecoveryCode")</h4>
 			</div>
 
-			<div id="codeNotSeen" class="error flex rounded-xl bg-error-background dark:bg-dark-error-background items-center p-4 mb-4 hidden">
+			<div id="codeNotSeen"
+				 class="error flex rounded-xl bg-error-background dark:bg-dark-error-background items-center p-4 mb-4 hidden">
 				<i class="fa-regular fa-exclamation-circle rounded-full p-3 text-error dark:text-dark-error bg-error/10 dark:bg-dark-error-icon mr-4 text-xl leading-none"></i>
 				<p class="font-body text-body-l text-space-blue dark:text-white">
 					$text.get("recovery_code.banner.error")
@@ -67,8 +70,9 @@
 				</agov-button>
 			</a>
 
-			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off" accept-charset="UTF-8"
-			class="flex flex-col flex-auto block ">
+			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
+				  accept-charset="UTF-8"
+				  class="flex flex-col flex-auto block ">
 
 				<div class="w-full sm:static mt-auto mb-6 sm:mb-0">
 					<div class="flex flex-col flex-row-reverse gap-4">
@@ -95,10 +99,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initBlurCode'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_code.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_fidokey_auth.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_fidokey_auth.vm
index 89697ae..c7a3b1f 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_fidokey_auth.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_fidokey_auth.vm
@@ -15,14 +15,17 @@
 				<h2 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("general.authenticate")</h2>
 			</div>
 
-			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get("recovery_fidokey_auth.keyRegistered")</h3>
+			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get(
+				"recovery_fidokey_auth.keyRegistered")</h3>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-2">
-				${text.get("recovery_fidokey_auth.instruction1").replaceAll("!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
+				${text.get("recovery_fidokey_auth.instruction1").replaceAll(
+					"!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
 			</p>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-8">
-				${text.get("recovery_fidokey_auth.instruction2").replaceAll("!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
+				${text.get("recovery_fidokey_auth.instruction2").replaceAll(
+					"!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
 			</p>
 
 			#set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
@@ -38,19 +41,22 @@
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">1</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("recovery_fidokey_auth.fidoInstruction")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"recovery_fidokey_auth.fidoInstruction")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">2</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction2")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction2")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">3</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction3")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction3")</p>
 				</div>
 			</div>
 
@@ -71,10 +77,7 @@
 			 class="max-w-[350px] md:max-w-[520px] w-full md:basis-1/2 hidden dark:block dark:sm:hidden dark:md:block">
 	</div>
 </div>
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initFido'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_fidokey_auth.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_intro_email.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_intro_email.vm
index 6c888e9..4a0dbcc 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_intro_email.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_intro_email.vm
@@ -185,10 +185,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initEmail'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_intro_email.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_intro_email_sent.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_intro_email_sent.vm
index 561cb75..f0e7be1 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_intro_email_sent.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_intro_email_sent.vm
@@ -41,17 +41,14 @@
 				<input class="hidden" name="authRequestId" type="hidden" value="$gui.getGuiElem('authRequestId').value"/>
 			</form>
 		</div>
-		<img alt="" src="${login.appDataPath}/static/images/recovery.svg"
+		<img alt="" src="${login.appDataPath}/static/js-code/images/recovery.svg"
 			 class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full md:basis-1/2 dark:hidden hidden md:block">
 		<img alt="" src="${login.appDataPath}/static/images/recovery_dark.svg"
 			 class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full md:basis-1/2 hidden dark:md:block">
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initEmail'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_intro_email_sent.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_questionnaire_loginfactor.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_questionnaire_loginfactor.vm
index dcf562b..fb8a9c6 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_questionnaire_loginfactor.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_questionnaire_loginfactor.vm
@@ -69,15 +69,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initAnswer'));
-	});
-
-	function setErrorBanner(value) {
-		document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
-		document.getElementById('buttons').style.marginTop = value ? '16px' : '8px';
-	}
+<script src="${login.appDataPath}/static/js-code/recovery_questionnaire_loginfactor.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_questionnaire_reason_selection.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_questionnaire_reason_selection.vm
index ff4226f..624b554 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_questionnaire_reason_selection.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/recovery_questionnaire_reason_selection.vm
@@ -88,15 +88,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initAnswer'));
-	});
-
-	function setErrorBanner(value) {
-		document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
-		console.log(document.getElementById('errorBanner').style.display);
-	}
+<script src="${login.appDataPath}/static/js-code/recovery_questionnaire_reason_selection.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/user_input.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/user_input.vm
index 74a2be1..a1a2e59 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/user_input.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/OP-ONBRDNG-AuthenticationRealm/webdata/template/user_input.vm
@@ -158,10 +158,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initEmail'));
-	});
+<script src="${login.appDataPath}/static/js-code/user_input.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/fido2_auth.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/fido2_auth.js
new file mode 100644
index 0000000..9f0def4
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/fido2_auth.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initFido'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_accessapp_auth.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_accessapp_auth.js
new file mode 100644
index 0000000..fb1ce98
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_accessapp_auth.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initQRCode'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_check_code.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_check_code.js
new file mode 100644
index 0000000..899a50a
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_check_code.js
@@ -0,0 +1,4 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initModal'));
+	document.dispatchEvent(new Event('initCode'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_code.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_code.js
new file mode 100644
index 0000000..3102c3b
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_code.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initBlurCode'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_fidokey_auth.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_fidokey_auth.js
new file mode 100644
index 0000000..9f0def4
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_fidokey_auth.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initFido'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_intro_email.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_intro_email.js
new file mode 100644
index 0000000..8f649df
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_intro_email.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initEmail'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_intro_email_sent.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_intro_email_sent.js
new file mode 100644
index 0000000..8f649df
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_intro_email_sent.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initEmail'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_questionnaire_loginfactor.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_questionnaire_loginfactor.js
new file mode 100644
index 0000000..6015e9c
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_questionnaire_loginfactor.js
@@ -0,0 +1,9 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initAnswer'));
+});
+
+// eslint-disable-next-line no-unused-vars
+function setErrorBanner(value) {
+	document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
+	document.getElementById('buttons').style.marginTop = value ? '16px' : '8px';
+}
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_questionnaire_reason_selection.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_questionnaire_reason_selection.js
new file mode 100644
index 0000000..04da7be
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/recovery_questionnaire_reason_selection.js
@@ -0,0 +1,9 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initAnswer'));
+});
+
+// eslint-disable-next-line no-unused-vars
+function setErrorBanner(value) {
+	document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
+	console.log(document.getElementById('errorBanner').style.display);
+}
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/user_input.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/user_input.js
new file mode 100644
index 0000000..8f649df
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/static/js-code/user_input.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initEmail'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/fido2_auth.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/fido2_auth.vm
index e82c4b1..d25fe13 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/fido2_auth.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/fido2_auth.vm
@@ -19,12 +19,12 @@
 			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
 				  accept-charset="UTF-8">
 				<div class="flex flex-row items-center justify-between">
-				#set ($emailInput = $gui.getGuiElem('email'))
-				#if ($emailInput && $emailInput.value && $emailInput.value.length() > 0)
-					<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate">$utils.escapeHtmlAttribute($emailInput.value)</p>
-				#else
-					<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate"></p>
-				#end
+					#set ($emailInput = $gui.getGuiElem('email'))
+					#if ($emailInput && $emailInput.value && $emailInput.value.length() > 0)
+						<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate">$utils.escapeHtmlAttribute($emailInput.value)</p>
+					#else
+						<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate"></p>
+					#end
 					<agov-button
 							class="shrink-0"
 							data-style="frameless"
@@ -52,19 +52,22 @@
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">1</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction1")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction1")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">2</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction2")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction2")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">3</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction3")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction3")</p>
 				</div>
 			</div>
 
@@ -119,10 +122,7 @@
 			 class="max-w-[350px] md:max-w-[520px] w-full md:basis-1/2 hidden dark:block dark:sm:hidden dark:md:block">
 	</div>
 </div>
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initFido'));
-	});
+<script src="${login.appDataPath}/static/js-code/fido2_auth.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/footer.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/footer.vm
index 808de73..657e72f 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/footer.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/footer.vm
@@ -3,7 +3,7 @@
 			$text.get("footer.text")
 			<a target="_blank" class='text-hyperlink dark:text-dark-hyperlink underline' href='$text.get("footer.link")'>$text.get("footer.link.label")</a>
 		</div>
-		<p>1.4.4.23-20240603T135747Z</p>
+		<p>1.5.3.51-20240709T140654Z</p>
 	</footer>
 	<script src="${login.appDataPath}/static/bundle.js"></script>
 </body>
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_accessapp_auth.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_accessapp_auth.vm
index 346fcba..87ba230 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_accessapp_auth.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_accessapp_auth.vm
@@ -15,14 +15,17 @@
 				<h2 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("general.authenticate")</h2>
 			</div>
 
-			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get("recovery_accessapp_auth.accessAppRegistered")</h3>
+			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get(
+				"recovery_accessapp_auth.accessAppRegistered")</h3>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-2">
-				${text.get("recovery_accessapp_auth.instruction1").replaceAll("!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
+				${text.get("recovery_accessapp_auth.instruction1").replaceAll(
+					"!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
 			</p>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-8">
-				${text.get("recovery_accessapp_auth.instruction2").replaceAll("!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
+				${text.get("recovery_accessapp_auth.instruction2").replaceAll(
+					"!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
 			</p>
 
 			<div id="accessAppModal" class="h-full">
@@ -55,7 +58,8 @@
 				</div>
 
 				<div class="relative flex flex-col h-full">
-					<div id="blurBackdrop" class="absolute backdrop-blur-sm top-0 bottom-0 -left-4 -right-4 z-10" style="display:none "></div>
+					<div id="blurBackdrop" class="absolute backdrop-blur-sm top-0 bottom-0 -left-4 -right-4 z-10"
+						 style="display:none "></div>
 					<div class="mobileBanner relative z-20" aria-live="assertive">
 						<div style="display: none"
 							 class="info flex rounded-xl bg-info-background dark:bg-dark-info-background items-center p-4 mb-4">
@@ -83,7 +87,8 @@
 							</p>
 						</div>
 					</div>
-					<div id="agovLoginImageMobile" style="display: none" class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full basis-1/2 mx-auto mb-4">
+					<div id="agovLoginImageMobile" style="display: none"
+						 class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full basis-1/2 mx-auto mb-4">
 						<img alt=""
 							 src="${login.appDataPath}/static/images/recovery.svg"
 							 class="block sm:hidden md:block dark:hidden w-full">
@@ -94,12 +99,14 @@
 					</div>
 					<div id="QRCodeHolder">
 						<div class="relative">
-							<canvas role="img" aria-labelledby="labelQRCodeInstructions" id="mauth_qrcode" class="mb-4 mx-auto"></canvas>
+							<canvas role="img" aria-labelledby="labelQRCodeInstructions" id="mauth_qrcode"
+									class="mb-4 mx-auto"></canvas>
 							<div class="hidden" id="QRcodeHiddenLink"></div>
 							<span id="spinner" class="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 z-20"
 								  style="display: none">
 								<img src="${login.appDataPath}/static/images/spinner.svg" class="animate-spin block dark:hidden">
-								<img src="${login.appDataPath}/static/images/spinner-dark.svg" class="animate-spin hidden dark:block">
+								<img src="${login.appDataPath}/static/images/spinner-dark.svg"
+									 class="animate-spin hidden dark:block">
 							</span>
 						</div>
 
@@ -147,7 +154,8 @@
 										data-name="EID"
 										data-value="EID"
 										data-id="EID"
-										data-label="<i class='fa-regular fa-eye align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get("mauth_usernameless.showQR")"
+										data-label="<i class='fa-regular fa-eye align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get(
+											"mauth_usernameless.showQR")"
 										data-type="button"
 										data-fullwidth="true">
 								</agov-button>
@@ -160,7 +168,8 @@
 										data-name="EID"
 										data-value="EID"
 										data-id="EID"
-										data-label="<i class='fa-regular fa-eye-slash align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get("mauth_usernameless.hideQR")"
+										data-label="<i class='fa-regular fa-eye-slash align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get(
+											"mauth_usernameless.hideQR")"
 										data-type="button"
 										data-fullwidth="true">
 								</agov-button>
@@ -179,10 +188,7 @@
 			 class="max-w-[350px] md:max-w-[520px] w-full md:basis-1/2 hidden dark:md:block">
 	</div>
 </div>
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initQRCode'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_accessapp_auth.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_check_code.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_check_code.vm
index 26843b4..22610c3 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_check_code.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_check_code.vm
@@ -13,12 +13,12 @@
 		</div>
 
 		<h4 id="modalTitle" class="font-header text-h4 text-space-blue dark:text-white mb-8">
-            $text.get("recovery_check_code.noCodeAccess")
+			$text.get("recovery_check_code.noCodeAccess")
 		</h4>
 
 		<div id="modalDescription" class="mb-20">
 			<p class="font-body text-body-l text-space-blue dark:text-white">
-                $text.get("recovery_check_code.noCodeAccessInstructions")
+				$text.get("recovery_check_code.noCodeAccessInstructions")
 			</p>
 		</div>
 
@@ -57,21 +57,21 @@
 				<h4 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("general.entryCode")</h4>
 			</div>
 
-            #set($error = $gui.getGuiElem("lasterror"))
-            #if (($error.value && $error.value != ""))
+			#set($error = $gui.getGuiElem("lasterror"))
+			#if (($error.value && $error.value != ""))
 				<div class="error flex rounded-xl bg-error-background dark:bg-dark-error-background items-center p-4 mb-6">
 					<i class="fa-regular fa-exclamation-circle rounded-full p-3 text-error dark:text-dark-error bg-error/10 dark:bg-dark-error-icon mr-4 text-xl leading-none"></i>
 					<p class="font-body text-body-l text-space-blue dark:text-white">
-                        $text.get("recovery_check_code.codeIncorrect")
+						$text.get("recovery_check_code.codeIncorrect")
 					</p>
 				</div>
-            #end
+			#end
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-2">
-                $text.get("recovery_check_code.instruction")
+				$text.get("recovery_check_code.instruction")
 			</p>
 
-            #set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
+			#set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
 			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
 				  accept-charset="UTF-8"
 				  class="flex flex-col flex-auto block ">
@@ -131,11 +131,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initModal'));
-		document.dispatchEvent(new Event('initCode'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_check_code.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_code.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_code.vm
index 40cd053..4986d26 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_code.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_code.vm
@@ -1,6 +1,7 @@
 #parse("${templatePath}/header.vm")
 #set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
-#set ($PDFRecoveryTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','').replaceAll('^(https:\/\/[^\/]+\/).*$', '$1')))
+#set ($PDFRecoveryTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','').replaceAll(
+	'^(https:\/\/[^\/]+\/).*$', '$1')))
 #set ($concat = "recovery/pdf?authToken=")
 #set ($PDFLink = "$PDFRecoveryTarget$concat$gui.getGuiElem('pdfAuthToken').value")
 
@@ -13,10 +14,12 @@
 
 			<div class="flex mb-6 items-baseline">
 				<h3 class="font-header text-h3 text-space-blue dark:text-white mr-3">$text.get("general.login")</h3>
-				<h4 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("recovery_code.newRecoveryCode")</h4>
+				<h4 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get(
+					"recovery_code.newRecoveryCode")</h4>
 			</div>
 
-			<div id="codeNotSeen" class="error flex rounded-xl bg-error-background dark:bg-dark-error-background items-center p-4 mb-4 hidden">
+			<div id="codeNotSeen"
+				 class="error flex rounded-xl bg-error-background dark:bg-dark-error-background items-center p-4 mb-4 hidden">
 				<i class="fa-regular fa-exclamation-circle rounded-full p-3 text-error dark:text-dark-error bg-error/10 dark:bg-dark-error-icon mr-4 text-xl leading-none"></i>
 				<p class="font-body text-body-l text-space-blue dark:text-white">
 					$text.get("recovery_code.banner.error")
@@ -67,8 +70,9 @@
 				</agov-button>
 			</a>
 
-			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off" accept-charset="UTF-8"
-			class="flex flex-col flex-auto block ">
+			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
+				  accept-charset="UTF-8"
+				  class="flex flex-col flex-auto block ">
 
 				<div class="w-full sm:static mt-auto mb-6 sm:mb-0">
 					<div class="flex flex-col flex-row-reverse gap-4">
@@ -95,10 +99,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initBlurCode'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_code.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_fidokey_auth.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_fidokey_auth.vm
index 89697ae..c7a3b1f 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_fidokey_auth.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_fidokey_auth.vm
@@ -15,14 +15,17 @@
 				<h2 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("general.authenticate")</h2>
 			</div>
 
-			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get("recovery_fidokey_auth.keyRegistered")</h3>
+			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get(
+				"recovery_fidokey_auth.keyRegistered")</h3>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-2">
-				${text.get("recovery_fidokey_auth.instruction1").replaceAll("!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
+				${text.get("recovery_fidokey_auth.instruction1").replaceAll(
+					"!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
 			</p>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-8">
-				${text.get("recovery_fidokey_auth.instruction2").replaceAll("!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
+				${text.get("recovery_fidokey_auth.instruction2").replaceAll(
+					"!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
 			</p>
 
 			#set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
@@ -38,19 +41,22 @@
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">1</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("recovery_fidokey_auth.fidoInstruction")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"recovery_fidokey_auth.fidoInstruction")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">2</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction2")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction2")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">3</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction3")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction3")</p>
 				</div>
 			</div>
 
@@ -71,10 +77,7 @@
 			 class="max-w-[350px] md:max-w-[520px] w-full md:basis-1/2 hidden dark:block dark:sm:hidden dark:md:block">
 	</div>
 </div>
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initFido'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_fidokey_auth.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_intro_email.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_intro_email.vm
index 6c888e9..4a0dbcc 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_intro_email.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_intro_email.vm
@@ -185,10 +185,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initEmail'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_intro_email.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_intro_email_sent.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_intro_email_sent.vm
index 561cb75..f0e7be1 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_intro_email_sent.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_intro_email_sent.vm
@@ -41,17 +41,14 @@
 				<input class="hidden" name="authRequestId" type="hidden" value="$gui.getGuiElem('authRequestId').value"/>
 			</form>
 		</div>
-		<img alt="" src="${login.appDataPath}/static/images/recovery.svg"
+		<img alt="" src="${login.appDataPath}/static/js-code/images/recovery.svg"
 			 class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full md:basis-1/2 dark:hidden hidden md:block">
 		<img alt="" src="${login.appDataPath}/static/images/recovery_dark.svg"
 			 class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full md:basis-1/2 hidden dark:md:block">
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initEmail'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_intro_email_sent.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_questionnaire_loginfactor.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_questionnaire_loginfactor.vm
index dcf562b..fb8a9c6 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_questionnaire_loginfactor.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_questionnaire_loginfactor.vm
@@ -69,15 +69,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initAnswer'));
-	});
-
-	function setErrorBanner(value) {
-		document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
-		document.getElementById('buttons').style.marginTop = value ? '16px' : '8px';
-	}
+<script src="${login.appDataPath}/static/js-code/recovery_questionnaire_loginfactor.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_questionnaire_reason_selection.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_questionnaire_reason_selection.vm
index ff4226f..624b554 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_questionnaire_reason_selection.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/recovery_questionnaire_reason_selection.vm
@@ -88,15 +88,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initAnswer'));
-	});
-
-	function setErrorBanner(value) {
-		document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
-		console.log(document.getElementById('errorBanner').style.display);
-	}
+<script src="${login.appDataPath}/static/js-code/recovery_questionnaire_reason_selection.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/user_input.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/user_input.vm
index 74a2be1..a1a2e59 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/user_input.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_admin_Realm/webdata/template/user_input.vm
@@ -158,10 +158,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initEmail'));
-	});
+<script src="${login.appDataPath}/static/js-code/user_input.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/fido2_auth.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/fido2_auth.js
new file mode 100644
index 0000000..9f0def4
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/fido2_auth.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initFido'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_accessapp_auth.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_accessapp_auth.js
new file mode 100644
index 0000000..fb1ce98
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_accessapp_auth.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initQRCode'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_check_code.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_check_code.js
new file mode 100644
index 0000000..899a50a
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_check_code.js
@@ -0,0 +1,4 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initModal'));
+	document.dispatchEvent(new Event('initCode'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_code.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_code.js
new file mode 100644
index 0000000..3102c3b
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_code.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initBlurCode'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_fidokey_auth.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_fidokey_auth.js
new file mode 100644
index 0000000..9f0def4
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_fidokey_auth.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initFido'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_intro_email.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_intro_email.js
new file mode 100644
index 0000000..8f649df
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_intro_email.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initEmail'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_intro_email_sent.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_intro_email_sent.js
new file mode 100644
index 0000000..8f649df
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_intro_email_sent.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initEmail'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_questionnaire_loginfactor.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_questionnaire_loginfactor.js
new file mode 100644
index 0000000..6015e9c
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_questionnaire_loginfactor.js
@@ -0,0 +1,9 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initAnswer'));
+});
+
+// eslint-disable-next-line no-unused-vars
+function setErrorBanner(value) {
+	document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
+	document.getElementById('buttons').style.marginTop = value ? '16px' : '8px';
+}
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_questionnaire_reason_selection.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_questionnaire_reason_selection.js
new file mode 100644
index 0000000..04da7be
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/recovery_questionnaire_reason_selection.js
@@ -0,0 +1,9 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initAnswer'));
+});
+
+// eslint-disable-next-line no-unused-vars
+function setErrorBanner(value) {
+	document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
+	console.log(document.getElementById('errorBanner').style.display);
+}
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/user_input.js b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/user_input.js
new file mode 100644
index 0000000..8f649df
--- /dev/null
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/static/js-code/user_input.js
@@ -0,0 +1,3 @@
+document.addEventListener('DOMContentLoaded', function() {
+	document.dispatchEvent(new Event('initEmail'));
+});
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/fido2_auth.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/fido2_auth.vm
index e82c4b1..d25fe13 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/fido2_auth.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/fido2_auth.vm
@@ -19,12 +19,12 @@
 			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
 				  accept-charset="UTF-8">
 				<div class="flex flex-row items-center justify-between">
-				#set ($emailInput = $gui.getGuiElem('email'))
-				#if ($emailInput && $emailInput.value && $emailInput.value.length() > 0)
-					<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate">$utils.escapeHtmlAttribute($emailInput.value)</p>
-				#else
-					<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate"></p>
-				#end
+					#set ($emailInput = $gui.getGuiElem('email'))
+					#if ($emailInput && $emailInput.value && $emailInput.value.length() > 0)
+						<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate">$utils.escapeHtmlAttribute($emailInput.value)</p>
+					#else
+						<p class="text-space-blue dark:text-white font-body-semi text-body-l truncate"></p>
+					#end
 					<agov-button
 							class="shrink-0"
 							data-style="frameless"
@@ -52,19 +52,22 @@
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">1</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction1")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction1")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">2</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction2")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction2")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">3</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction3")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction3")</p>
 				</div>
 			</div>
 
@@ -119,10 +122,7 @@
 			 class="max-w-[350px] md:max-w-[520px] w-full md:basis-1/2 hidden dark:block dark:sm:hidden dark:md:block">
 	</div>
 </div>
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initFido'));
-	});
+<script src="${login.appDataPath}/static/js-code/fido2_auth.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/footer.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/footer.vm
index 808de73..657e72f 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/footer.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/footer.vm
@@ -3,7 +3,7 @@
 			$text.get("footer.text")
 			<a target="_blank" class='text-hyperlink dark:text-dark-hyperlink underline' href='$text.get("footer.link")'>$text.get("footer.link.label")</a>
 		</div>
-		<p>1.4.4.23-20240603T135747Z</p>
+		<p>1.5.3.51-20240709T140654Z</p>
 	</footer>
 	<script src="${login.appDataPath}/static/bundle.js"></script>
 </body>
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_accessapp_auth.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_accessapp_auth.vm
index 346fcba..87ba230 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_accessapp_auth.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_accessapp_auth.vm
@@ -15,14 +15,17 @@
 				<h2 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("general.authenticate")</h2>
 			</div>
 
-			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get("recovery_accessapp_auth.accessAppRegistered")</h3>
+			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get(
+				"recovery_accessapp_auth.accessAppRegistered")</h3>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-2">
-				${text.get("recovery_accessapp_auth.instruction1").replaceAll("!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
+				${text.get("recovery_accessapp_auth.instruction1").replaceAll(
+					"!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
 			</p>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-8">
-				${text.get("recovery_accessapp_auth.instruction2").replaceAll("!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
+				${text.get("recovery_accessapp_auth.instruction2").replaceAll(
+					"!!!ACCESS_APP_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('accessApp').value)")}
 			</p>
 
 			<div id="accessAppModal" class="h-full">
@@ -55,7 +58,8 @@
 				</div>
 
 				<div class="relative flex flex-col h-full">
-					<div id="blurBackdrop" class="absolute backdrop-blur-sm top-0 bottom-0 -left-4 -right-4 z-10" style="display:none "></div>
+					<div id="blurBackdrop" class="absolute backdrop-blur-sm top-0 bottom-0 -left-4 -right-4 z-10"
+						 style="display:none "></div>
 					<div class="mobileBanner relative z-20" aria-live="assertive">
 						<div style="display: none"
 							 class="info flex rounded-xl bg-info-background dark:bg-dark-info-background items-center p-4 mb-4">
@@ -83,7 +87,8 @@
 							</p>
 						</div>
 					</div>
-					<div id="agovLoginImageMobile" style="display: none" class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full basis-1/2 mx-auto mb-4">
+					<div id="agovLoginImageMobile" style="display: none"
+						 class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full basis-1/2 mx-auto mb-4">
 						<img alt=""
 							 src="${login.appDataPath}/static/images/recovery.svg"
 							 class="block sm:hidden md:block dark:hidden w-full">
@@ -94,12 +99,14 @@
 					</div>
 					<div id="QRCodeHolder">
 						<div class="relative">
-							<canvas role="img" aria-labelledby="labelQRCodeInstructions" id="mauth_qrcode" class="mb-4 mx-auto"></canvas>
+							<canvas role="img" aria-labelledby="labelQRCodeInstructions" id="mauth_qrcode"
+									class="mb-4 mx-auto"></canvas>
 							<div class="hidden" id="QRcodeHiddenLink"></div>
 							<span id="spinner" class="absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 z-20"
 								  style="display: none">
 								<img src="${login.appDataPath}/static/images/spinner.svg" class="animate-spin block dark:hidden">
-								<img src="${login.appDataPath}/static/images/spinner-dark.svg" class="animate-spin hidden dark:block">
+								<img src="${login.appDataPath}/static/images/spinner-dark.svg"
+									 class="animate-spin hidden dark:block">
 							</span>
 						</div>
 
@@ -147,7 +154,8 @@
 										data-name="EID"
 										data-value="EID"
 										data-id="EID"
-										data-label="<i class='fa-regular fa-eye align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get("mauth_usernameless.showQR")"
+										data-label="<i class='fa-regular fa-eye align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get(
+											"mauth_usernameless.showQR")"
 										data-type="button"
 										data-fullwidth="true">
 								</agov-button>
@@ -160,7 +168,8 @@
 										data-name="EID"
 										data-value="EID"
 										data-id="EID"
-										data-label="<i class='fa-regular fa-eye-slash align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get("mauth_usernameless.hideQR")"
+										data-label="<i class='fa-regular fa-eye-slash align-middle text-xl text-indigo dark:text-lilac mr-2'></i>$text.get(
+											"mauth_usernameless.hideQR")"
 										data-type="button"
 										data-fullwidth="true">
 								</agov-button>
@@ -179,10 +188,7 @@
 			 class="max-w-[350px] md:max-w-[520px] w-full md:basis-1/2 hidden dark:md:block">
 	</div>
 </div>
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initQRCode'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_accessapp_auth.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_check_code.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_check_code.vm
index 26843b4..22610c3 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_check_code.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_check_code.vm
@@ -13,12 +13,12 @@
 		</div>
 
 		<h4 id="modalTitle" class="font-header text-h4 text-space-blue dark:text-white mb-8">
-            $text.get("recovery_check_code.noCodeAccess")
+			$text.get("recovery_check_code.noCodeAccess")
 		</h4>
 
 		<div id="modalDescription" class="mb-20">
 			<p class="font-body text-body-l text-space-blue dark:text-white">
-                $text.get("recovery_check_code.noCodeAccessInstructions")
+				$text.get("recovery_check_code.noCodeAccessInstructions")
 			</p>
 		</div>
 
@@ -57,21 +57,21 @@
 				<h4 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("general.entryCode")</h4>
 			</div>
 
-            #set($error = $gui.getGuiElem("lasterror"))
-            #if (($error.value && $error.value != ""))
+			#set($error = $gui.getGuiElem("lasterror"))
+			#if (($error.value && $error.value != ""))
 				<div class="error flex rounded-xl bg-error-background dark:bg-dark-error-background items-center p-4 mb-6">
 					<i class="fa-regular fa-exclamation-circle rounded-full p-3 text-error dark:text-dark-error bg-error/10 dark:bg-dark-error-icon mr-4 text-xl leading-none"></i>
 					<p class="font-body text-body-l text-space-blue dark:text-white">
-                        $text.get("recovery_check_code.codeIncorrect")
+						$text.get("recovery_check_code.codeIncorrect")
 					</p>
 				</div>
-            #end
+			#end
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-2">
-                $text.get("recovery_check_code.instruction")
+				$text.get("recovery_check_code.instruction")
 			</p>
 
-            #set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
+			#set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
 			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
 				  accept-charset="UTF-8"
 				  class="flex flex-col flex-auto block ">
@@ -131,11 +131,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initModal'));
-		document.dispatchEvent(new Event('initCode'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_check_code.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_code.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_code.vm
index 40cd053..4986d26 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_code.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_code.vm
@@ -1,6 +1,7 @@
 #parse("${templatePath}/header.vm")
 #set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
-#set ($PDFRecoveryTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','').replaceAll('^(https:\/\/[^\/]+\/).*$', '$1')))
+#set ($PDFRecoveryTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','').replaceAll(
+	'^(https:\/\/[^\/]+\/).*$', '$1')))
 #set ($concat = "recovery/pdf?authToken=")
 #set ($PDFLink = "$PDFRecoveryTarget$concat$gui.getGuiElem('pdfAuthToken').value")
 
@@ -13,10 +14,12 @@
 
 			<div class="flex mb-6 items-baseline">
 				<h3 class="font-header text-h3 text-space-blue dark:text-white mr-3">$text.get("general.login")</h3>
-				<h4 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("recovery_code.newRecoveryCode")</h4>
+				<h4 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get(
+					"recovery_code.newRecoveryCode")</h4>
 			</div>
 
-			<div id="codeNotSeen" class="error flex rounded-xl bg-error-background dark:bg-dark-error-background items-center p-4 mb-4 hidden">
+			<div id="codeNotSeen"
+				 class="error flex rounded-xl bg-error-background dark:bg-dark-error-background items-center p-4 mb-4 hidden">
 				<i class="fa-regular fa-exclamation-circle rounded-full p-3 text-error dark:text-dark-error bg-error/10 dark:bg-dark-error-icon mr-4 text-xl leading-none"></i>
 				<p class="font-body text-body-l text-space-blue dark:text-white">
 					$text.get("recovery_code.banner.error")
@@ -67,8 +70,9 @@
 				</agov-button>
 			</a>
 
-			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off" accept-charset="UTF-8"
-			class="flex flex-col flex-auto block ">
+			<form id="$gui.name" name="$gui.name" method="POST" target="_self" action="$formTarget" autocomplete="off"
+				  accept-charset="UTF-8"
+				  class="flex flex-col flex-auto block ">
 
 				<div class="w-full sm:static mt-auto mb-6 sm:mb-0">
 					<div class="flex flex-col flex-row-reverse gap-4">
@@ -95,10 +99,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initBlurCode'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_code.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_fidokey_auth.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_fidokey_auth.vm
index 89697ae..c7a3b1f 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_fidokey_auth.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_fidokey_auth.vm
@@ -15,14 +15,17 @@
 				<h2 class="font-header text-h4 text-disabled-grey dark:text-silver">$text.get("general.authenticate")</h2>
 			</div>
 
-			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get("recovery_fidokey_auth.keyRegistered")</h3>
+			<h3 class="font-header text-h5 text-space-blue dark:text-white mb-4">$text.get(
+				"recovery_fidokey_auth.keyRegistered")</h3>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-2">
-				${text.get("recovery_fidokey_auth.instruction1").replaceAll("!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
+				${text.get("recovery_fidokey_auth.instruction1").replaceAll(
+					"!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
 			</p>
 
 			<p class="font-body text-body-l text-space-blue dark:text-white mb-8">
-				${text.get("recovery_fidokey_auth.instruction2").replaceAll("!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
+				${text.get("recovery_fidokey_auth.instruction2").replaceAll(
+					"!!!SECURITY_KEY_NAME!!!", "$utils.escapeHtmlAttribute($gui.getGuiElem('securityKey').value)")}
 			</p>
 
 			#set ($formTarget = $utils.escapeHtmlAttribute($gui.target.replaceAll('&?language=[^&]*','')))
@@ -38,19 +41,22 @@
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">1</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("recovery_fidokey_auth.fidoInstruction")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"recovery_fidokey_auth.fidoInstruction")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">2</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction2")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction2")</p>
 				</div>
 
 				<div class="flex mb-2 items-center">
 					<span class="font-header text-h6 bg-royal-light-blue dark:bg-blueish-black w-12 h-12 flex flex-none items-center justify-center rounded-full
 					text-space-blue dark:text-white leading-none">3</span>
-					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get("fido2_auth.instruction3")</p>
+					<p class="font-body-semi text-body-l text-space-blue dark:text-white ml-4">$text.get(
+						"fido2_auth.instruction3")</p>
 				</div>
 			</div>
 
@@ -71,10 +77,7 @@
 			 class="max-w-[350px] md:max-w-[520px] w-full md:basis-1/2 hidden dark:block dark:sm:hidden dark:md:block">
 	</div>
 </div>
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initFido'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_fidokey_auth.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_intro_email.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_intro_email.vm
index 6c888e9..4a0dbcc 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_intro_email.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_intro_email.vm
@@ -185,10 +185,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initEmail'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_intro_email.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_intro_email_sent.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_intro_email_sent.vm
index 561cb75..f0e7be1 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_intro_email_sent.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_intro_email_sent.vm
@@ -41,17 +41,14 @@
 				<input class="hidden" name="authRequestId" type="hidden" value="$gui.getGuiElem('authRequestId').value"/>
 			</form>
 		</div>
-		<img alt="" src="${login.appDataPath}/static/images/recovery.svg"
+		<img alt="" src="${login.appDataPath}/static/js-code/images/recovery.svg"
 			 class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full md:basis-1/2 dark:hidden hidden md:block">
 		<img alt="" src="${login.appDataPath}/static/images/recovery_dark.svg"
 			 class="md:max-w-[520px] max-w-[350px] sm:max-w-[300px] w-full md:basis-1/2 hidden dark:md:block">
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initEmail'));
-	});
+<script src="${login.appDataPath}/static/js-code/recovery_intro_email_sent.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_questionnaire_loginfactor.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_questionnaire_loginfactor.vm
index dcf562b..fb8a9c6 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_questionnaire_loginfactor.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_questionnaire_loginfactor.vm
@@ -69,15 +69,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initAnswer'));
-	});
-
-	function setErrorBanner(value) {
-		document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
-		document.getElementById('buttons').style.marginTop = value ? '16px' : '8px';
-	}
+<script src="${login.appDataPath}/static/js-code/recovery_questionnaire_loginfactor.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_questionnaire_reason_selection.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_questionnaire_reason_selection.vm
index ff4226f..624b554 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_questionnaire_reason_selection.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/recovery_questionnaire_reason_selection.vm
@@ -88,15 +88,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initAnswer'));
-	});
-
-	function setErrorBanner(value) {
-		document.getElementById('errorBanner').style.display = value ? 'none' : 'flex';
-		console.log(document.getElementById('errorBanner').style.display);
-	}
+<script src="${login.appDataPath}/static/js-code/recovery_questionnaire_reason_selection.js">
 </script>
 
 #parse("${templatePath}/footer.vm")
\ No newline at end of file
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/user_input.vm b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/user_input.vm
index 74a2be1..a1a2e59 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/user_input.vm
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/logrend/var/opt/nevislogrend/default/data/applications/SAML_SP_nevisidm_operations_Realm/webdata/template/user_input.vm
@@ -158,10 +158,7 @@
 	</div>
 </div>
 
-<script>
-	document.addEventListener('DOMContentLoaded', function () {
-		document.dispatchEvent(new Event('initEmail'));
-	});
+<script src="${login.appDataPath}/static/js-code/user_input.js">
 </script>
 
 
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/etc/nevis/k8s-nevisproxy-instance-idm-3bc06037962ad13be0a3a95d.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/etc/nevis/k8s-nevisproxy-instance-idm-3bc06037962ad13be0a3a95d.yaml
index 46e3862..429816a 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/etc/nevis/k8s-nevisproxy-instance-idm-3bc06037962ad13be0a3a95d.yaml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/etc/nevis/k8s-nevisproxy-instance-idm-3bc06037962ad13be0a3a95d.yaml
@@ -28,20 +28,25 @@ spec:
     management:
       httpGet:
         path: "/liveness"
-      initialDelaySeconds: 40
-      periodSeconds: 30
+      periodSeconds: 5
       timeoutSeconds: 6
   readinessProbe:
     management:
       httpGet:
         path: "/readiness"
-      initialDelaySeconds: 40
-      periodSeconds: 30
+      periodSeconds: 5
       timeoutSeconds: 6
+  startupProbe:
+    management:
+      httpGet:
+        path: "/readiness"
+      periodSeconds: 5
+      timeoutSeconds: 6
+      failureThreshold: 50
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-c8a2ac2ea6277d4f605767f8eb567015feac6dec"
+    tag: "r-937b0c071785a44df35dbbfe5a32b4cd60dc6198"
     dir: "DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm"
     credentials: "git-credentials"
   keystores:
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/conf/navajo.xml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/conf/navajo.xml
index 4b4e483..be1d3db 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/conf/navajo.xml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/conf/navajo.xml
@@ -8,7 +8,7 @@
         <!-- source: pattern://3bc06037962ad13be0a3a95d -->
         <Timer periodicity="60"/>
         <!-- source: pattern://3bc06037962ad13be0a3a95d -->
-        <Server User="nevis" Group="root" ServerAdmin="admin@company.com" ServerName="proxy-idm" Timeout="30" MaxClients="600" MaxRequestsPerChild="0" KeepAlive="on" KeepAliveTimeout="5" MaxKeepAliveRequests="100" LimitRequestLine="5120" LimitRequestBody="512000" LimitRequestFields="50" LimitRequestFieldsize="5120" ServerRoot="/var/opt/nevisproxy/default" CoreDumpDirectory="" ErrorLog="&quot;|/bin/sed -u s/^/[apache.log]\ /g&quot;" Loglevel="notice" TransferLog="&quot;|/bin/stdbuf -oL /bin/egrep -v GET./.....?ness&quot;" LogFormat="&quot;[access.log] %h %l %u %t \&quot;%r\&quot; %&gt;s %b %{content-length}i %T %v \&quot;%{Referer}i\&quot; \&quot;%{User-Agent}i\&quot; trID=%{UNIQUE_ID}e&quot;" SSLPassPhraseDialog="builtin" SSLSessionCache="shmcb:/var/opt/nevisproxy/default/run/apache_shmcb"/>
+        <Server User="nevis" Group="root" ServerName="proxy-idm" Timeout="30" MaxClients="600" MaxRequestsPerChild="0" KeepAlive="on" KeepAliveTimeout="5" MaxKeepAliveRequests="100" LimitRequestLine="5120" LimitRequestBody="512000" LimitRequestFields="50" LimitRequestFieldsize="5120" ServerRoot="/var/opt/nevisproxy/default" CoreDumpDirectory="" ErrorLog="&quot;|/bin/sed -u s/^/[apache.log]\ /g&quot;" LogLevel="notice" TransferLog="&quot;|/bin/stdbuf -oL /bin/egrep -v GET./.....?ness&quot;" LogFormat="&quot;[access.log] %h %l %u %t \&quot;%r\&quot; %&gt;s %b %{content-length}i %T %v \&quot;%{Referer}i\&quot; \&quot;%{User-Agent}i\&quot; trID=%{UNIQUE_ID}e&quot;" SSLPassPhraseDialog="builtin" SSLSessionCache="shmcb:/var/opt/nevisproxy/default/run/apache_shmcb"/>
         <!-- source: pattern://3bc06037962ad13be0a3a95d -->
         <Connector port="11080" name="management" listen="0.0.0.0:11080"/>
         <!-- source: pattern://1200a58c76686d520c21edb0 -->
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/host-admin.agov-w.azure.adnovum.net/WEB-INF/web.xml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/host-admin.agov-w.azure.adnovum.net/WEB-INF/web.xml
index 2a6c964..ff51044 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/host-admin.agov-w.azure.adnovum.net/WEB-INF/web.xml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/host-admin.agov-w.azure.adnovum.net/WEB-INF/web.xml
@@ -171,8 +171,8 @@
         </init-param>
         <!-- source: pattern://6f9c9f982dcc7ef59a34f1f7 -->
         <init-param>
-            <param-name>StateKey</param-name>
-            <param-value>SAML_SP_nevisidm_admin_Realm</param-value>
+            <param-name>StoreInterceptedRequest</param-name>
+            <param-value>false</param-value>
         </init-param>
     </filter>
     <!-- source: pattern://1200a58c76686d520c21edb0 -->
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/host-admin.agov-w.azure.adnovum.net/resources/index.html b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/host-admin.agov-w.azure.adnovum.net/resources/index.html
index 75474b0..0808ab9 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/host-admin.agov-w.azure.adnovum.net/resources/index.html
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-idm/var/opt/nevisproxy/default/host-admin.agov-w.azure.adnovum.net/resources/index.html
@@ -62,8 +62,6 @@
 		<p class="font-body text-body-l text-black dark:text-white mx-auto text-center">We are working on it. Please try again
 			later.</p>
 	</div>
-
-	<!-- TODO update here when italian is available -->
 </div>
 
 <script src="/resources/static/bundle.js"></script>
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/etc/nevis/k8s-operations-nevisproxy-instance-bd83dfbd467e8211ffe71d28.yaml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/etc/nevis/k8s-operations-nevisproxy-instance-bd83dfbd467e8211ffe71d28.yaml
index 93d166a..993fc8d 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/etc/nevis/k8s-operations-nevisproxy-instance-bd83dfbd467e8211ffe71d28.yaml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/etc/nevis/k8s-operations-nevisproxy-instance-bd83dfbd467e8211ffe71d28.yaml
@@ -28,20 +28,25 @@ spec:
     management:
       httpGet:
         path: "/liveness"
-      initialDelaySeconds: 40
-      periodSeconds: 30
+      periodSeconds: 5
       timeoutSeconds: 6
   readinessProbe:
     management:
       httpGet:
         path: "/readiness"
-      initialDelaySeconds: 40
-      periodSeconds: 30
+      periodSeconds: 5
       timeoutSeconds: 6
+  startupProbe:
+    management:
+      httpGet:
+        path: "/readiness"
+      periodSeconds: 5
+      timeoutSeconds: 6
+      failureThreshold: 50
   podDisruptionBudget:
     maxUnavailable: "50%"
   git:
-    tag: "r-c8a2ac2ea6277d4f605767f8eb567015feac6dec"
+    tag: "r-937b0c071785a44df35dbbfe5a32b4cd60dc6198"
     dir: "DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp"
     credentials: "git-credentials"
   keystores:
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/conf/navajo.xml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/conf/navajo.xml
index e9d815e..f2a42f2 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/conf/navajo.xml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/conf/navajo.xml
@@ -8,7 +8,7 @@
         <!-- source: pattern://bd83dfbd467e8211ffe71d28 -->
         <Timer periodicity="60"/>
         <!-- source: pattern://bd83dfbd467e8211ffe71d28 -->
-        <Server User="nevis" Group="root" ServerAdmin="admin@company.com" ServerName="proxy-sp" Timeout="30" MaxClients="600" MaxRequestsPerChild="0" KeepAlive="on" KeepAliveTimeout="5" MaxKeepAliveRequests="100" LimitRequestLine="5120" LimitRequestBody="512000" LimitRequestFields="50" LimitRequestFieldsize="5120" ServerRoot="/var/opt/nevisproxy/default" CoreDumpDirectory="" ErrorLog="&quot;|/bin/sed -u s/^/[apache.log]\ /g&quot;" Loglevel="notice" TransferLog="&quot;|/bin/stdbuf -oL /bin/egrep -v GET./.....?ness&quot;" LogFormat="&quot;[access.log] %h %l %u %t \&quot;%r\&quot; %&gt;s %b %{content-length}i %T %v \&quot;%{Referer}i\&quot; \&quot;%{User-Agent}i\&quot; trID=%{UNIQUE_ID}e&quot;" SSLPassPhraseDialog="builtin" SSLSessionCache="shmcb:/var/opt/nevisproxy/default/run/apache_shmcb"/>
+        <Server User="nevis" Group="root" ServerName="proxy-sp" Timeout="30" MaxClients="600" MaxRequestsPerChild="0" KeepAlive="on" KeepAliveTimeout="5" MaxKeepAliveRequests="100" LimitRequestLine="5120" LimitRequestBody="512000" LimitRequestFields="50" LimitRequestFieldsize="5120" ServerRoot="/var/opt/nevisproxy/default" CoreDumpDirectory="" ErrorLog="&quot;|/bin/sed -u s/^/[apache.log]\ /g&quot;" LogLevel="notice" TransferLog="&quot;|/bin/stdbuf -oL /bin/egrep -v GET./.....?ness&quot;" LogFormat="&quot;[access.log] %h %l %u %t \&quot;%r\&quot; %&gt;s %b %{content-length}i %T %v \&quot;%{Referer}i\&quot; \&quot;%{User-Agent}i\&quot; trID=%{UNIQUE_ID}e&quot;" SSLPassPhraseDialog="builtin" SSLSessionCache="shmcb:/var/opt/nevisproxy/default/run/apache_shmcb"/>
         <!-- source: pattern://bd83dfbd467e8211ffe71d28 -->
         <Connector port="11080" name="management" listen="0.0.0.0:11080"/>
         <!-- source: pattern://39ecde9a0d101628fed3e3be -->
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/host-op.agov-w.azure.adnovum.net/WEB-INF/web.xml b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/host-op.agov-w.azure.adnovum.net/WEB-INF/web.xml
index 36c61cc..b7e18f5 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/host-op.agov-w.azure.adnovum.net/WEB-INF/web.xml
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/host-op.agov-w.azure.adnovum.net/WEB-INF/web.xml
@@ -311,8 +311,8 @@
         </init-param>
         <!-- source: pattern://7518c6cc61e47eec6322ae17 -->
         <init-param>
-            <param-name>StateKey</param-name>
-            <param-value>SAML_SP_nevisidm_operations_Realm</param-value>
+            <param-name>StoreInterceptedRequest</param-name>
+            <param-value>false</param-value>
         </init-param>
     </filter>
     <!-- source: pattern://39ecde9a0d101628fed3e3be -->
diff --git a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/host-op.agov-w.azure.adnovum.net/resources/index.html b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/host-op.agov-w.azure.adnovum.net/resources/index.html
index 75474b0..0808ab9 100644
--- a/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/host-op.agov-w.azure.adnovum.net/resources/index.html
+++ b/DEFAULT-ADN-AGOV-ADMIN-PROJECT/DEFAULT-ADN-AGOV-ADMIN-INV/proxy-sp/var/opt/nevisproxy/default/host-op.agov-w.azure.adnovum.net/resources/index.html
@@ -62,8 +62,6 @@
 		<p class="font-body text-body-l text-black dark:text-white mx-auto text-center">We are working on it. Please try again
 			later.</p>
 	</div>
-
-	<!-- TODO update here when italian is available -->
 </div>
 
 <script src="/resources/static/bundle.js"></script>