diff --git a/public/index-alpha.html b/public/index-alpha.html
index ae8b403e95..8f54b32a29 100644
--- a/public/index-alpha.html
+++ b/public/index-alpha.html
@@ -78,6 +78,7 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <div id="portal"></div>
+    <div id="onboard-container"></div>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
diff --git a/public/index-dev.html b/public/index-dev.html
index a8c7dc9dd2..fe399dc3e3 100644
--- a/public/index-dev.html
+++ b/public/index-dev.html
@@ -78,6 +78,7 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <div id="portal"></div>
+    <div id="onboard-container"></div>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
diff --git a/public/index-prod.html b/public/index-prod.html
index 22ff7f1719..5ed6ab4257 100644
--- a/public/index-prod.html
+++ b/public/index-prod.html
@@ -78,6 +78,7 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <div id="portal"></div>
+    <div id="onboard-container"></div>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
diff --git a/public/index-staging.html b/public/index-staging.html
index 92187a9996..416ae8068d 100644
--- a/public/index-staging.html
+++ b/public/index-staging.html
@@ -78,6 +78,7 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <div id="portal"></div>
+    <div id="onboard-container"></div>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
diff --git a/public/index-w2w.html b/public/index-w2w.html
index c26828c797..28bade3dc1 100644
--- a/public/index-w2w.html
+++ b/public/index-w2w.html
@@ -78,6 +78,7 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <div id="portal"></div>
+    <div id="onboard-container"></div>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
diff --git a/public/index.html b/public/index.html
index 4cdc6cf2ea..bdd636d644 100644
--- a/public/index.html
+++ b/public/index.html
@@ -82,6 +82,7 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
     <div id="portal"></div>
+    <div id="onboard-container"></div>
     <!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
diff --git a/src/AppLogin.tsx b/src/AppLogin.tsx
index 84546e880a..fca0598c77 100644
--- a/src/AppLogin.tsx
+++ b/src/AppLogin.tsx
@@ -81,6 +81,15 @@ useEffect(() => {
   handleErrorMessage(authError);
 }, [authError]);
 
+  useEffect(() => {
+    try {
+      setAuthError(undefined);
+      connect();
+    }
+    catch(error){
+      setAuthError(error);
+    }
+  }, []);
 
   // RENDER
   return (
@@ -125,7 +134,7 @@ useEffect(() => {
         </ItemVV2>
 
         {/* Login Component */}
-        <ItemVV2
+        {/* <ItemVV2
           background={theme.default.bg}
           maxWidth="440px"
           padding={GLOBALS.ADJUSTMENTS.PADDING.DEFAULT}
@@ -140,9 +149,9 @@ useEffect(() => {
             fontWeight="500"
             margin={`${GLOBALS.ADJUSTMENTS.MARGIN.VERTICAL} 0`}>
             Connect a Wallet
-          </H2V2>
+          </H2V2> */}
 
-          <ItemVV2 alignSelf="stretch" alignItems="flex-start" margin={`0 0 ${GLOBALS.ADJUSTMENTS.MARGIN.VERTICAL} 0`}>
+          {/* <ItemVV2 alignSelf="stretch" alignItems="flex-start" margin={`0 0 ${GLOBALS.ADJUSTMENTS.MARGIN.VERTICAL} 0`}>
             {Object.keys(web3Connectors).map((name) => {
               const disabled = isActive();
               const image = theme.scheme == 'light' ? web3Connectors[name].logolight : web3Connectors[name].logodark;
@@ -181,10 +190,10 @@ useEffect(() => {
                 </LoginButton>
               );
             })}
-          </ItemVV2>
+          </ItemVV2> */}
 
           {/* TOS and PRIVACY */}
-          <SpanV2 fontSize="14px" padding="0px 20px 10px 20px" color={theme.default.color} lineHeight="140%">
+          {/* <SpanV2 fontSize="14px" padding="0px 20px 10px 20px" color={theme.default.color} lineHeight="140%">
             By connecting your wallet, <b>You agree</b> to our{' '}
             <AInlineV2 href="https://epns.io/tos" target="_blank">
               Terms of Service
@@ -195,7 +204,7 @@ useEffect(() => {
             </AInlineV2>
             .
           </SpanV2>
-        </ItemVV2>
+        </ItemVV2> */}
 
         {/* Chainsafe Audit and Discord */}
         <ItemVV2 margin="30px 0 0 0" flex="initial" maxWidth="920px">
diff --git a/src/connectors/web3Onboard.tsx b/src/connectors/web3Onboard.tsx
index 906175a0b0..75cc7b82ba 100644
--- a/src/connectors/web3Onboard.tsx
+++ b/src/connectors/web3Onboard.tsx
@@ -32,6 +32,10 @@ export const web3Onboard = Onboard({
     showSidebar: true,
     autoConnectLastWallet: true,
     removeWhereIsMyWalletWarning: true,
+    disableClose: true,
+  },
+  containerElements: {
+    connectModal: "#onboard-container"
   },
   wallets: [injected, walletConnect],
   chains: chains,