diff --git a/modules/features/org.wso2.identity.jaggery.apps.feature/src/main/resources/sp_dashboard.xml b/modules/features/org.wso2.identity.jaggery.apps.feature/src/main/resources/sp_dashboard.xml
index 1d41cf10b6c..b50c0ba7d66 100644
--- a/modules/features/org.wso2.identity.jaggery.apps.feature/src/main/resources/sp_dashboard.xml
+++ b/modules/features/org.wso2.identity.jaggery.apps.feature/src/main/resources/sp_dashboard.xml
@@ -20,16 +20,19 @@
 						<Name>BasicAuthenticator</Name>
 						<DisplayName>basicauth</DisplayName>
 						<IsEnabled>true</IsEnabled>
+						<DefinedBy>SYSTEM</DefinedBy>
 					</LocalAuthenticatorConfig>
 				</LocalAuthenticatorConfigs>
 				<!-- FederatedIdentityProviders>
 				 <IdentityProvider>
 				       <IdentityProviderName>facebook</IdentityProviderName>
 				       <IsEnabled>true</IsEnabled>
+				       <DefinedBy>SYSTEM</DefinedBy>
                                      <DefaultAuthenticatorConfig>
                                              <FederatedAuthenticatorConfig> 
                                                      <Name>FacebookAuthenticator</Name>
                                                      <IsEnabled>true</IsEnabled>
+                                                     <DefinedBy>SYSTEM</DefinedBy>
                                              </FederatedAuthenticatorConfig>
                                      </DefaultAuthenticatorConfig>
 				 </IdentityProvider>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-idp.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-idp.xml
index cba23f56fb2..efba5fae11e 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-idp.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-idp.xml
@@ -5,11 +5,13 @@
     <Alias>secondaryIS</Alias>
     <IsPrimary>true</IsPrimary>
     <IsEnabled>true</IsEnabled>
+    <DefinedBy>SYSTEM</DefinedBy>
     <FederatedAuthenticatorConfigs>
         <saml2>
             <Name>SAMLSSOAuthenticator</Name>
             <DisplayName>samlsso</DisplayName>
             <IsEnabled>true</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties>
                 <property>
                     <Name>IdpEntityId</Name>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-sp.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-sp.xml
index 0c655e6dc68..f5f48eeff91 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-sp.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/saml-sp.xml
@@ -19,10 +19,12 @@
                     <IdentityProvider>
                         <IdentityProviderName>secondaryIS</IdentityProviderName>
                         <IsEnabled>true</IsEnabled>
+                        <DefinedBy>SYSTEM</DefinedBy>
                         <FederatedAuthenticatorConfigs>
                             <FederatedAuthenticatorConfig>
                                 <Name>SAMLSSOAuthenticator</Name>
                                 <IsEnabled>true</IsEnabled>
+                                <DefinedBy>SYSTEM</DefinedBy>
                             </FederatedAuthenticatorConfig>
                         </FederatedAuthenticatorConfigs>
                         <DefaultAuthenticatorConfig>SAMLSSOAuthenticator</DefaultAuthenticatorConfig>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/self.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/self.xml
index ef9d0cea2fa..ac0a69a1c8b 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/self.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/artifacts/IS/saml/filebasedspidpconfigs/self.xml
@@ -68,6 +68,7 @@
             <Name>BasicAuthenticator</Name>
             <DisplayName>basicauth</DisplayName>
             <IsEnabled>true</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
         </LocalAuthenticatorConfigs>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/incorrect_default_seq.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/incorrect_default_seq.xml
index db8d6756728..9aea1dbd9db 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/incorrect_default_seq.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/incorrect_default_seq.xml
@@ -7,6 +7,7 @@
             <Name>BasicAusssthenticator</Name>
             <DisplayName>basic</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
         </LocalAuthenticatorConfigs>
@@ -21,12 +22,14 @@
             <Name>totp</Name>
             <DisplayName>totp</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
           <LocalAuthenticatorConfig>
             <Name>FIDOAuthesssnticator</Name>
             <DisplayName>fido</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
         </LocalAuthenticatorConfigs>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/invalid_content_default_seq.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/invalid_content_default_seq.xml
index 856f8f8d5af..1c5b1345d53 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/invalid_content_default_seq.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/invalid_content_default_seq.xml
@@ -65,6 +65,7 @@
             <Name>BasicAuthenticator</Name>
             <DisplayName>basic</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
         </LocalAuthenticatorConfigs>
@@ -79,12 +80,14 @@
             <Name>totp</Name>
             <DisplayName>totp</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
           <LocalAuthenticatorConfig>
             <Name>FIDOAuthenticator</Name>
             <DisplayName>fido</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
         </LocalAuthenticatorConfigs>
@@ -100,41 +103,43 @@
     <UseUserstoreDomainInRoles>true</UseUserstoreDomainInRoles>
     <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
     <EnableAuthorization>true</EnableAuthorization>
-    <AuthenticationScript enabled="true" language="application/javascript"><![CDATA[
-// Role-Based from Template...
-
-// This script will step up authentication for any user belonging
-// to one of the given roles
-// If the user has any of the below roles, authentication will be stepped up
-var rolesToStepUp = ['admin', 'manager'];
-
-function onLoginRequest(context) {
-    executeStep(1, {
-        onSuccess: function (context) {
-            // Extracting authenticated subject from the first step
-            var user = context.currentKnownSubject;
-            // Checking if the user is assigned to one of the given roles
-            var hasRole = hasAnyOfTheRoles(user, rolesToStepUp);
-            if (hasRole) {
-                Log.info(user.username + ' Has one of Roles: ' + rolesToStepUp.toString());
-                executeStep(2);
-            }
-        }
-    });
-}
-
-// End of Role-Based.......
+    <AuthenticationScript enabled="true" language="application/javascript"><![CDATA[
+// Role-Based from Template...
+
+// This script will step up authentication for any user belonging
+// to one of the given roles
+// If the user has any of the below roles, authentication will be stepped up
+var rolesToStepUp = ['admin', 'manager'];
+
+function onLoginRequest(context) {
+    executeStep(1, {
+        onSuccess: function (context) {
+            // Extracting authenticated subject from the first step
+            var user = context.currentKnownSubject;
+            // Checking if the user is assigned to one of the given roles
+            var hasRole = hasAnyOfTheRoles(user, rolesToStepUp);
+            if (hasRole) {
+                Log.info(user.username + ' Has one of Roles: ' + rolesToStepUp.toString());
+                executeStep(2);
+            }
+        }
+    });
+}
+
+// End of Role-Based.......
 ]]></AuthenticationScript>
   </LocalAndOutBoundAuthenticationConfig>
   <RequestPathAuthenticatorConfigs>
     <RequestPathAuthenticatorConfig>
       <Name>OAuthRequestPathAuthenticator</Name>
       <IsEnabled>false</IsEnabled>
+      <DefinedBy>SYSTEM</DefinedBy>
       <Properties/>
     </RequestPathAuthenticatorConfig>
     <RequestPathAuthenticatorConfig>
       <Name>BasicAuthRequestPathAuthenticator</Name>
       <IsEnabled>false</IsEnabled>
+      <DefinedBy>SYSTEM</DefinedBy>
       <Properties/>
     </RequestPathAuthenticatorConfig>
   </RequestPathAuthenticatorConfigs>
@@ -154,6 +159,7 @@ function onLoginRequest(context) {
         <IsPrimary>false</IsPrimary>
         <IsFederationHub>false</IsFederationHub>
         <IsEnabled>false</IsEnabled>
+        <DefinedBy>SYSTEM</DefinedBy>
         <FederatedAuthenticatorConfigs/>
         <ProvisioningConnectorConfigs/>
         <DefaultProvisioningConnectorConfig>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/invalid_xml_element_default_seq.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/invalid_xml_element_default_seq.xml
index e22c7df7a94..994c990a200 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/invalid_xml_element_default_seq.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/invalid_xml_element_default_seq.xml
@@ -7,6 +7,7 @@
                     <Name>BasicAuthenticator</Name>
                     <DisplayName>basic</DisplayName>
                     <IsEnabled>false</IsEnabled>
+                    <DefinedBy>SYSTEM</DefinedBy>
                     <Properties/>
                 </LocalAuthenticatorConfig>
             </LocalAuthenticatorConfigs>
@@ -21,6 +22,7 @@
                     <Name>totp</Name>
                     <DisplayName>totp</DisplayName>
                     <IsEnabled>false</IsEnabled>
+                    <DefinedBy>SYSTEM</DefinedBy>
                     <Properties/>
                 </LocalAuthenticatorConfig>
             </LocalAuthenticatorConfigs>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/valid_default_seq.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/valid_default_seq.xml
index bc09baf2e18..a4b33338721 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/valid_default_seq.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/defaultAuthSeq/valid_default_seq.xml
@@ -7,6 +7,7 @@
             <Name>BasicAuthenticator</Name>
             <DisplayName>basic</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
         </LocalAuthenticatorConfigs>
@@ -21,6 +22,7 @@
             <Name>totp</Name>
             <DisplayName>totp</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
         </LocalAuthenticatorConfigs>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/spFile/TestServer.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/spFile/TestServer.xml
index 6b990ae12ac..844fd833de7 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/spFile/TestServer.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/spFile/TestServer.xml
@@ -106,6 +106,7 @@
             <Name>BasicAuthenticator</Name>
             <DisplayName>basic</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
         </LocalAuthenticatorConfigs>
@@ -120,6 +121,7 @@
             <Name>totp</Name>
             <DisplayName>totp</DisplayName>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
           </LocalAuthenticatorConfig>
         </LocalAuthenticatorConfigs>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate2.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate2.xml
index 091f4c3eec8..058f4d4a9f0 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate2.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate2.xml
@@ -8,6 +8,7 @@
                         <Name>BasicAuthenticator</Name>
                         <DisplayName>basicauth</DisplayName>
                         <IsEnabled>false</IsEnabled>
+                        <DefinedBy>SYSTEM</DefinedBy>
                         <Properties/>
                     </LocalAuthenticatorConfig>
                 </LocalAuthenticatorConfigs>
@@ -22,6 +23,7 @@
                         <Name>totp</Name>
                         <DisplayName>totp</DisplayName>
                         <IsEnabled>false</IsEnabled>
+                        <DefinedBy>SYSTEM</DefinedBy>
                         <Properties/>
                     </LocalAuthenticatorConfig>
                 </LocalAuthenticatorConfigs>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate4.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate4.xml
index 298fe9a2b43..307c0888bf6 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate4.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate4.xml
@@ -8,6 +8,7 @@
                         <Name>BasicAusssthenticator</Name>
                         <DisplayName>basic</DisplayName>
                         <IsEnabled>false</IsEnabled>
+                        <DefinedBy>SYSTEM</DefinedBy>
                         <Properties/>
                     </LocalAuthenticatorConfig>
                 </LocalAuthenticatorConfigs>
@@ -22,12 +23,14 @@
                         <Name>totp</Name>
                         <DisplayName>totp</DisplayName>
                         <IsEnabled>false</IsEnabled>
+                        <DefinedBy>SYSTEM</DefinedBy>
                         <Properties/>
                     </LocalAuthenticatorConfig>
                     <LocalAuthenticatorConfig>
                         <Name>FIDOAuthesssnticator</Name>
                         <DisplayName>fido</DisplayName>
                         <IsEnabled>false</IsEnabled>
+                        <DefinedBy>SYSTEM</DefinedBy>
                         <Properties/>
                     </LocalAuthenticatorConfig>
                 </LocalAuthenticatorConfigs>
@@ -73,11 +76,13 @@ function onLoginRequest(context) {
         <RequestPathAuthenticatorConfig>
             <Name>OAuthRequestPathAuthesssnticator</Name>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
         </RequestPathAuthenticatorConfig>
         <RequestPathAuthenticatorConfig>
             <Name>BasicAuthRequestPathAuthsssenticator</Name>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
         </RequestPathAuthenticatorConfig>
     </RequestPathAuthenticatorConfigs>
@@ -97,6 +102,7 @@ function onLoginRequest(context) {
                 <IsPrimary>false</IsPrimary>
                 <IsFederationHub>false</IsFederationHub>
                 <IsEnabled>false</IsEnabled>
+                <DefinedBy>SYSTEM</DefinedBy>
                 <FederatedAuthenticatorConfigs/>
                 <ProvisioningConnectorConfigs/>
                 <DefaultProvisioningConnectorConfig>
diff --git a/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate5.xml b/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate5.xml
index 86380aea134..93bb63d94ef 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate5.xml
+++ b/modules/integration/tests-integration/tests-backend/src/test/resources/spTemplate/TestTemplate5.xml
@@ -8,6 +8,7 @@
                         <Name>BasicAuthenticator</Name>
                         <DisplayName>basic</DisplayName>
                         <IsEnabled>false</IsEnabled>
+                        <DefinedBy>SYSTEM</DefinedBy>
                         <Properties/>
                     </LocalAuthenticatorConfig>
                 </LocalAuthenticatorConfigs>
@@ -22,12 +23,14 @@
                         <Name>totp</Name>
                         <DisplayName>totp</DisplayName>
                         <IsEnabled>false</IsEnabled>
+                        <DefinedBy>SYSTEM</DefinedBy>
                         <Properties/>
                     </LocalAuthenticatorConfig>
                     <LocalAuthenticatorConfig>
                         <Name>FIDOAuthenticator</Name>
                         <DisplayName>fido</DisplayName>
                         <IsEnabled>false</IsEnabled>
+                        <DefinedBy>SYSTEM</DefinedBy>
                         <Properties/>
                     </LocalAuthenticatorConfig>
                 </LocalAuthenticatorConfigs>
@@ -73,11 +76,13 @@ function onLoginRequest(context) {
         <RequestPathAuthenticatorConfig>
             <Name>OAuthRequestPathAuthenticator</Name>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
         </RequestPathAuthenticatorConfig>
         <RequestPathAuthenticatorConfig>
             <Name>BasicAuthRequestPathAuthenticator</Name>
             <IsEnabled>false</IsEnabled>
+            <DefinedBy>SYSTEM</DefinedBy>
             <Properties/>
         </RequestPathAuthenticatorConfig>
     </RequestPathAuthenticatorConfigs>
@@ -97,6 +102,7 @@ function onLoginRequest(context) {
                 <IsPrimary>false</IsPrimary>
                 <IsFederationHub>false</IsFederationHub>
                 <IsEnabled>false</IsEnabled>
+                <DefinedBy>SYSTEM</DefinedBy>
                 <FederatedAuthenticatorConfigs/>
                 <ProvisioningConnectorConfigs/>
                 <DefaultProvisioningConnectorConfig>