diff --git a/apps/console/src/features/applications/components/settings/access-configuration.tsx b/apps/console/src/features/applications/components/settings/access-configuration.tsx
index 34a24c3641e..9f63677b8e1 100644
--- a/apps/console/src/features/applications/components/settings/access-configuration.tsx
+++ b/apps/console/src/features/applications/components/settings/access-configuration.tsx
@@ -553,8 +553,17 @@ export const AccessConfiguration: FunctionComponent<AccessConfigurationPropsInte
                                         ]
                                 }
                                 initialValues={
-                                    get(inboundProtocolConfig, selectedProtocol)
-                                        ? inboundProtocolConfig[ selectedProtocol ]
+                                    get(
+                                        inboundProtocolConfig,
+                                        selectedProtocol === SupportedAuthProtocolTypes.OAUTH2_OIDC
+                                            ? SupportedAuthProtocolTypes.OIDC
+                                            : selectedProtocol
+                                    )
+                                        ? inboundProtocolConfig[
+                                            selectedProtocol === SupportedAuthProtocolTypes.OAUTH2_OIDC
+                                                ? SupportedAuthProtocolTypes.OIDC
+                                                : selectedProtocol
+                                            ]
                                         : undefined
                                 }
                                 onSubmit={ handleSubmit }
@@ -590,8 +599,17 @@ export const AccessConfiguration: FunctionComponent<AccessConfigurationPropsInte
                                         ]
                                 }
                                 initialValues={
-                                    get(inboundProtocolConfig, selectedProtocol)
-                                        ? inboundProtocolConfig[ selectedProtocol ]
+                                    get(
+                                        inboundProtocolConfig,
+                                        selectedProtocol === SupportedAuthProtocolTypes.OAUTH2_OIDC
+                                            ? SupportedAuthProtocolTypes.OIDC
+                                            : selectedProtocol
+                                    )
+                                        ? inboundProtocolConfig[
+                                            selectedProtocol === SupportedAuthProtocolTypes.OAUTH2_OIDC
+                                                ? SupportedAuthProtocolTypes.OIDC
+                                                : selectedProtocol
+                                            ]
                                         : undefined
                                 }
                                 onSubmit={ handleSubmit }
diff --git a/apps/console/src/features/applications/components/wizard/minimal-application-create-wizard.tsx b/apps/console/src/features/applications/components/wizard/minimal-application-create-wizard.tsx
index e321e6d40a3..0b0828541e2 100644
--- a/apps/console/src/features/applications/components/wizard/minimal-application-create-wizard.tsx
+++ b/apps/console/src/features/applications/components/wizard/minimal-application-create-wizard.tsx
@@ -253,7 +253,8 @@ export const MinimalAppCreateWizard: FunctionComponent<MinimalApplicationCreateW
             delete templateSettingsClone?.application?.inboundProtocolConfiguration?.saml?.templateConfiguration;
         }
 
-        const application: MainApplicationInterface = merge(templateSettingsClone?.application, protocolFormValues);
+        const application: MainApplicationInterface = cloneDeep(merge(templateSettingsClone?.application,
+            protocolFormValues));
 
         application.name = generalFormValues.get("name").toString();
         application.templateId = selectedTemplate.id;
@@ -262,6 +263,14 @@ export const MinimalAppCreateWizard: FunctionComponent<MinimalApplicationCreateW
         if (selectedTemplate.id === CustomApplicationTemplate.id) {
             if (customApplicationProtocol === SupportedAuthProtocolTypes.OAUTH2_OIDC) {
                 application.templateId = ApplicationManagementConstants.CUSTOM_APPLICATION_OIDC;
+                // Custom OAuth2/OIDC Apps are created with `client_credentials` grant by default.
+                application.inboundProtocolConfiguration = {
+                    oidc: {
+                        grantTypes: [
+                            "client_credentials"
+                        ]
+                    }
+                };
             } else if (customApplicationProtocol === SupportedAuthProtocolTypes.SAML) {
                 application.templateId = ApplicationManagementConstants.CUSTOM_APPLICATION_SAML;
             } else if (customApplicationProtocol === SupportedAuthProtocolTypes.WS_FEDERATION) {
diff --git a/apps/console/src/features/applications/data/application-templates/templates/custom-application/custom-application.json b/apps/console/src/features/applications/data/application-templates/templates/custom-application/custom-application.json
index b115b54122c..d62139df60a 100644
--- a/apps/console/src/features/applications/data/application-templates/templates/custom-application/custom-application.json
+++ b/apps/console/src/features/applications/data/application-templates/templates/custom-application/custom-application.json
@@ -15,14 +15,5 @@
         "oidc",
         "saml"
     ],
-    "application": {
-        "name": "",
-        "inboundProtocolConfiguration": {
-            "oidc": {
-                "grantTypes": [
-                    "client_credentials"
-                ]
-            }
-        }
-    }
+    "application": null
 }