diff --git a/features/admin.applications.v1/components/settings/sign-on-methods/components/sign-on-methods-core.tsx b/features/admin.applications.v1/components/settings/sign-on-methods/components/sign-on-methods-core.tsx
index be81eaaf553..acc0083cb6a 100644
--- a/features/admin.applications.v1/components/settings/sign-on-methods/components/sign-on-methods-core.tsx
+++ b/features/admin.applications.v1/components/settings/sign-on-methods/components/sign-on-methods-core.tsx
@@ -899,6 +899,59 @@ export const SignOnMethodsCore: FunctionComponent<SignOnMethodsCorePropsInterfac
         );
     };
 
+    const renderLegacyAuthenticationFlowBuilder = (): ReactElement => {
+        if (isLoading || isAuthenticatorsFetchRequestLoading) {
+            return (
+                <ContentLoader inline="centered" active />
+            );
+        }
+
+        if (!readOnly && !loginFlow && isDefaultFlowConfiguration()) {
+            return (
+                <SignInMethodLanding
+                    readOnly={ readOnly }
+                    clientId={ clientId }
+                    onLoginFlowSelect={ (type: LoginFlowTypes) => {
+                        handleLoginFlowSelect(
+                            type,
+                            googleAuthenticators,
+                            gitHubAuthenticators,
+                            facebookAuthenticators,
+                            microsoftAuthenticators,
+                            appleAuthenticators
+                        );
+                    } }
+                    data-componentid={ `${componentId}-landing` }
+                />
+            );
+        }
+
+        return (
+            <SignInMethodCustomization
+                appId={ appId }
+                applicationName={ application?.name }
+                isApplicationShared={ isApplicationShared }
+                authenticators={ authenticators }
+                clientId={ clientId }
+                authenticationSequence={ moderatedAuthenticationSequence }
+                onIDPCreateWizardTrigger={ (type: string, cb: () => void, template: any) => {
+                    setSelectedIDPTemplate(template);
+                    setIDPCreateWizardTriggerOrigin("EXTERNAL");
+                    setIDPTemplateTypeToTrigger(type);
+                    setShowMissingSocialAuthenticatorModal(false);
+                    setShowIDPCreateWizard(true);
+                    broadcastIDPCreateSuccessMessage = cb;
+                } }
+                onUpdate={ onUpdate }
+                onReset={ handleLoginFlowReset }
+                data-componentid={ componentId }
+                isLoading={ isAuthenticatorsFetchRequestLoading }
+                setIsLoading={ setIsAuthenticatorsFetchRequestLoading }
+                readOnly={ readOnly }
+            />
+        );
+    };
+
     return (
         <AuthenticationFlowProvider
             application={ cloneDeep(application) }
@@ -912,54 +965,7 @@ export const SignOnMethodsCore: FunctionComponent<SignOnMethodsCorePropsInterfac
             authenticationSequence={ moderatedAuthenticationSequence }
         >
             <AuthenticationFlowBuilder
-                legacyBuilder={ (
-                    <>
-                        { !(isLoading || isAuthenticatorsFetchRequestLoading) ? (
-                            !readOnly && !loginFlow && isDefaultFlowConfiguration() ? (
-                                <SignInMethodLanding
-                                    readOnly={ readOnly }
-                                    clientId={ clientId }
-                                    onLoginFlowSelect={ (type: LoginFlowTypes) => {
-                                        handleLoginFlowSelect(
-                                            type,
-                                            googleAuthenticators,
-                                            gitHubAuthenticators,
-                                            facebookAuthenticators,
-                                            microsoftAuthenticators,
-                                            appleAuthenticators
-                                        );
-                                    } }
-                                    data-componentid={ `${componentId}-landing` }
-                                />
-                            ) : (
-                                <SignInMethodCustomization
-                                    appId={ appId }
-                                    applicationName={ application?.name }
-                                    isApplicationShared={ isApplicationShared }
-                                    authenticators={ authenticators }
-                                    clientId={ clientId }
-                                    authenticationSequence={ moderatedAuthenticationSequence }
-                                    onIDPCreateWizardTrigger={ (type: string, cb: () => void, template: any) => {
-                                        setSelectedIDPTemplate(template);
-                                        setIDPCreateWizardTriggerOrigin("EXTERNAL");
-                                        setIDPTemplateTypeToTrigger(type);
-                                        setShowMissingSocialAuthenticatorModal(false);
-                                        setShowIDPCreateWizard(true);
-                                        broadcastIDPCreateSuccessMessage = cb;
-                                    } }
-                                    onUpdate={ onUpdate }
-                                    onReset={ handleLoginFlowReset }
-                                    data-componentid={ componentId }
-                                    isLoading={ isAuthenticatorsFetchRequestLoading }
-                                    setIsLoading={ setIsAuthenticatorsFetchRequestLoading }
-                                    readOnly={ readOnly }
-                                />
-                            )
-                        ) : (
-                            <ContentLoader inline="centered" active />
-                        ) }
-                    </>
-                ) }
+                legacyBuilder={ renderLegacyAuthenticationFlowBuilder() }
                 onIDPCreateWizardTrigger={ (type: string, cb: () => void, template: any) => {
                     setSelectedIDPTemplate(template);
                     setIDPCreateWizardTriggerOrigin("EXTERNAL");