diff --git a/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml
index 5701d5d697..dfdf0713f1 100644
--- a/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml
+++ b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml
@@ -6,8 +6,8 @@
             <Parameters>
                 <Parameter Name="IsRemote">false</Parameter>
                 <Parameter Name="TokenValidationEndpointUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</Parameter>
-                <Parameter Name="Username">${admin.username}</Parameter>
-                <Parameter Name="Password">${admin.password}</Parameter>
+                <Parameter Name="Username">{{super_admin.username}}</Parameter>
+                <Parameter Name="Password">{{super_admin.password}}</Parameter>
                 <Parameter Name="MaxTotalConnections">100</Parameter>
                 <Parameter Name="MaxConnectionsPerHost">100</Parameter>
             </Parameters>
diff --git a/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2 b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2
index 7c3ce35486..6c51e0f2b6 100644
--- a/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2
+++ b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2
@@ -14,8 +14,8 @@
             <Parameters>
                 <Parameter Name="IsRemote">false</Parameter>
                 <Parameter Name="TokenValidationEndpointUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</Parameter>
-                <Parameter Name="Username">${admin.username}</Parameter>
-                <Parameter Name="Password">${admin.password}</Parameter>
+                <Parameter Name="Username">{{super_admin.username}}</Parameter>
+                <Parameter Name="Password">{{super_admin.password}}</Parameter>
                 <Parameter Name="MaxTotalConnections">100</Parameter>
                 <Parameter Name="MaxConnectionsPerHost">100</Parameter>
             </Parameters>