diff --git a/src/features/app_start/shared/hooks/useFeedback.tsx b/src/features/app_start/shared/hooks/useFeedback.tsx
index 4a311a465c..a3bc69cde6 100644
--- a/src/features/app_start/shared/hooks/useFeedback.tsx
+++ b/src/features/app_start/shared/hooks/useFeedback.tsx
@@ -14,7 +14,9 @@ const useFeedback = () => {
     document.querySelector<HTMLElement>('#onboarding-error');
 
   const hideMessage = () => {
-    onboardingError.style.animation = 'fade-out 0.15s forwards';
+    if (onboardingError) {
+      onboardingError.style.animation = 'fade-out 0.15s forwards';
+    }
   };
 
   const showMessage = () => {
diff --git a/src/features/app_start/vip/startup/index.tsx b/src/features/app_start/vip/startup/index.tsx
index 6522f24135..8d098992cf 100644
--- a/src/features/app_start/vip/startup/index.tsx
+++ b/src/features/app_start/vip/startup/index.tsx
@@ -27,13 +27,25 @@ const VipStartup = () => {
       {!isCongCreate && !isEncryptionCodeOpen && isLoading && (
         <WaitingLoader type="lottie" variant="standard" />
       )}
-      {isUserSignIn && <Signin />}
-      {isUserMfaVerify && <VerifyMFA />}
-      {isUserAccountCreated && <UserAccountCreated />}
-      {isCongCreate && <CongregationCreate />}
-      {isEmailAuth && <EmailAuth />}
-      {isEmailLinkAuth && <EmailLinkAuthentication />}
-      {isEncryptionCodeOpen && <CongregationEncryption />}
+
+      {!isLoading && (
+        <>
+          {isUserSignIn && <Signin />}
+
+          {!isUserSignIn && (
+            <>
+              {isUserMfaVerify && <VerifyMFA />}
+              {isUserAccountCreated && <UserAccountCreated />}
+              {isCongCreate && <CongregationCreate />}
+              {isEmailAuth && <EmailAuth />}
+              {isEmailLinkAuth && <EmailLinkAuthentication />}
+              {!isCongCreate && isEncryptionCodeOpen && (
+                <CongregationEncryption />
+              )}
+            </>
+          )}
+        </>
+      )}
     </>
   );
 };
diff --git a/src/features/app_start/vip/startup/useStartup.tsx b/src/features/app_start/vip/startup/useStartup.tsx
index 4d068f4081..cb9375ba24 100644
--- a/src/features/app_start/vip/startup/useStartup.tsx
+++ b/src/features/app_start/vip/startup/useStartup.tsx
@@ -169,7 +169,7 @@ const useStartup = () => {
         return;
       }
 
-      if (congAccessCode.length === 0) {
+      if (congAccessCode.length === 0 && congName.length > 0) {
         setIsStart(false);
         setIsEncryptionCodeOpen(true);
       }