diff --git a/web/cashtab/extension/src/components/App.js b/web/cashtab/extension/src/components/App.js
--- a/web/cashtab/extension/src/components/App.js
+++ b/web/cashtab/extension/src/components/App.js
@@ -34,7 +34,7 @@
 } from 'react-router-dom';
 // Extension-only import used for open in new tab link
 import PopOut from 'assets/popout.svg';
-
+import OnBoarding from './OnBoarding/OnBoarding';
 const GlobalStyle = createGlobalStyle`    
     *::placeholder {
         color: ${props => props.theme.forms.placeholder} !important;
@@ -262,49 +262,79 @@
                             {/*Hence <ProtectableComponentWrapper> is not pulled in*/}
                             <Switch>
                                 <Route path="/wallet">
-                                    <Home />
+                                    {wallet ? <Home /> : <OnBoarding />}
                                 </Route>
                                 <Route path="/receive">
-                                    <Receive
-                                        passLoadingStatus={
-                                            setLoadingUtxosAfterSend
-                                        }
-                                    />
+                                    {wallet ? (
+                                        <Receive
+                                            passLoadingStatus={
+                                                setLoadingUtxosAfterSend
+                                            }
+                                        />
+                                    ) : (
+                                        <Redirect to="/wallet" />
+                                    )}
                                 </Route>
+
                                 <Route path="/tokens">
-                                    <Tokens
-                                        passLoadingStatus={
-                                            setLoadingUtxosAfterSend
-                                        }
-                                    />
+                                    {wallet ? (
+                                        <Tokens
+                                            passLoadingStatus={
+                                                setLoadingUtxosAfterSend
+                                            }
+                                        />
+                                    ) : (
+                                        <Redirect to="/wallet" />
+                                    )}
                                 </Route>
                                 <Route path="/send">
-                                    <Send
-                                        passLoadingStatus={
-                                            setLoadingUtxosAfterSend
-                                        }
-                                    />
+                                    {wallet ? (
+                                        <Send
+                                            passLoadingStatus={
+                                                setLoadingUtxosAfterSend
+                                            }
+                                        />
+                                    ) : (
+                                        <Redirect to="/wallet" />
+                                    )}
                                 </Route>
                                 <Route
                                     path="/send-token/:tokenId"
                                     render={props => (
-                                        <SendToken
-                                            tokenId={props.match.params.tokenId}
+                                        <>
+                                            {wallet ? (
+                                                <SendToken
+                                                    tokenId={
+                                                        props.match.params
+                                                            .tokenId
+                                                    }
+                                                    passLoadingStatus={
+                                                        setLoadingUtxosAfterSend
+                                                    }
+                                                />
+                                            ) : (
+                                                <Redirect to="/wallet" />
+                                            )}
+                                        </>
+                                    )}
+                                />
+                                <Route path="/airdrop">
+                                    {wallet ? (
+                                        <Airdrop
                                             passLoadingStatus={
                                                 setLoadingUtxosAfterSend
                                             }
                                         />
+                                    ) : (
+                                        <Redirect to="/wallet" />
                                     )}
-                                />
-                                <Route path="/airdrop">
-                                    <Airdrop
-                                        passLoadingStatus={
-                                            setLoadingUtxosAfterSend
-                                        }
-                                    />
                                 </Route>
                                 <Route path="/configure">
-                                    <Configure />
+                                    {wallet ? (
+                                        <Configure />
+                                    ) : (
+                                        <Redirect to="/wallet" />
+                                    )}
                                 </Route>
                                 <Redirect exact from="/" to="/wallet" />
                                 <Route component={NotFound} />
diff --git a/web/cashtab/src/components/Airdrop/Airdrop.js b/web/cashtab/src/components/Airdrop/Airdrop.js
--- a/web/cashtab/src/components/Airdrop/Airdrop.js
+++ b/web/cashtab/src/components/Airdrop/Airdrop.js
@@ -44,7 +44,6 @@
 } from 'components/Common/Atoms';
 import WalletLabel from 'components/Common/WalletLabel.js';
 import { Link } from 'react-router-dom';
-
 const AirdropActions = styled.div`
     text-align: center;
     width: 100%;
diff --git a/web/cashtab/src/components/App.js b/web/cashtab/src/components/App.js
--- a/web/cashtab/src/components/App.js
+++ b/web/cashtab/src/components/App.js
@@ -37,7 +37,7 @@
 import { checkForTokenById } from 'utils/tokenMethods.js';
 // Biometric security import not used in extension/src/components/App.js
 import ProtectableComponentWrapper from './Authentication/ProtectableComponentWrapper';
-
+import OnBoarding from './OnBoarding/OnBoarding';
 const GlobalStyle = createGlobalStyle`
     *::placeholder {
         color: ${props => props.theme.forms.placeholder} !important;
@@ -279,51 +279,78 @@
                             <ProtectableComponentWrapper>
                                 <Switch>
                                     <Route path="/wallet">
-                                        <Home />
+                                        {wallet ? <Home /> : <OnBoarding />}
                                     </Route>
                                     <Route path="/receive">
-                                        <Receive
-                                            passLoadingStatus={
-                                                setLoadingUtxosAfterSend
-                                            }
-                                        />
+                                        {wallet ? (
+                                            <Receive
+                                                passLoadingStatus={
+                                                    setLoadingUtxosAfterSend
+                                                }
+                                            />
+                                        ) : (
+                                            <OnBoarding />
+                                        )}
                                     </Route>
                                     <Route path="/tokens">
-                                        <Tokens
-                                            passLoadingStatus={
-                                                setLoadingUtxosAfterSend
-                                            }
-                                        />
+                                        {wallet ? (
+                                            <Tokens
+                                                passLoadingStatus={
+                                                    setLoadingUtxosAfterSend
+                                                }
+                                            />
+                                        ) : (
+                                            <OnBoarding />
+                                        )}
                                     </Route>
                                     <Route path="/send">
-                                        <Send
-                                            passLoadingStatus={
-                                                setLoadingUtxosAfterSend
-                                            }
-                                        />
+                                        {wallet ? (
+                                            <Send
+                                                passLoadingStatus={
+                                                    setLoadingUtxosAfterSend
+                                                }
+                                            />
+                                        ) : (
+                                            <OnBoarding />
+                                        )}
                                     </Route>
                                     <Route
                                         path="/send-token/:tokenId"
                                         render={props => (
-                                            <SendToken
-                                                tokenId={
-                                                    props.match.params.tokenId
-                                                }
+                                            <>
+                                                {wallet ? (
+                                                    <SendToken
+                                                        tokenId={
+                                                            props.match.params
+                                                                .tokenId
+                                                        }
+                                                        passLoadingStatus={
+                                                            setLoadingUtxosAfterSend
+                                                        }
+                                                    />
+                                                ) : (
+                                                    <OnBoarding />
+                                                )}
+                                            </>
+                                        )}
+                                    />
+                                    <Route path="/airdrop">
+                                        {wallet ? (
+                                            <Airdrop
                                                 passLoadingStatus={
                                                     setLoadingUtxosAfterSend
                                                 }
                                             />
+                                        ) : (
+                                            <OnBoarding />
                                         )}
-                                    />
-                                    <Route path="/airdrop">
-                                        <Airdrop
-                                            passLoadingStatus={
-                                                setLoadingUtxosAfterSend
-                                            }
-                                        />
                                     </Route>
                                     <Route path="/configure">
-                                        <Configure />
+                                        {wallet ? (
+                                            <Configure />
+                                        ) : (
+                                            <OnBoarding />
+                                        )}
                                     </Route>
                                     <Redirect exact from="/" to="/wallet" />
                                     <Route component={NotFound} />
diff --git a/web/cashtab/src/components/Configure/Configure.js b/web/cashtab/src/components/Configure/Configure.js
--- a/web/cashtab/src/components/Configure/Configure.js
+++ b/web/cashtab/src/components/Configure/Configure.js
@@ -54,7 +54,6 @@
 import { formatSavedBalance } from 'utils/formatting';
 import { isValidXecAddress } from 'utils/validation';
 import { convertToEcashPrefix } from 'utils/cashMethods';
-
 import { currency } from 'components/Common/Ticker.js';
 const { Panel } = Collapse;
 
diff --git a/web/cashtab/src/components/Home/Home.js b/web/cashtab/src/components/Home/Home.js
--- a/web/cashtab/src/components/Home/Home.js
+++ b/web/cashtab/src/components/Home/Home.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import styled from 'styled-components';
 import { WalletContext } from 'utils/context';
-import OnBoarding from 'components/OnBoarding/OnBoarding';
 import { currency } from 'components/Common/Ticker.js';
 import { Link } from 'react-router-dom';
 import TokenList from './TokenList';
@@ -236,24 +235,9 @@
 
 const Home = () => {
     const ContextValue = React.useContext(WalletContext);
-    const { wallet, previousWallet, loading } = ContextValue;
+    const { loading } = ContextValue;
 
-    return (
-        <>
-            {loading ? (
-                <LoadingCtn />
-            ) : (
-                <>
-                    {(wallet && wallet.Path1899) ||
-                    (previousWallet && previousWallet.path1899) ? (
-                        <WalletInfo />
-                    ) : (
-                        <OnBoarding />
-                    )}
-                </>
-            )}
-        </>
-    );
+    return <>{loading ? <LoadingCtn /> : <WalletInfo />}</>;
 };
 
 export default Home;
diff --git a/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap b/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap
--- a/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap
+++ b/web/cashtab/src/components/Home/__tests__/__snapshots__/Home.test.js.snap
@@ -3,15 +3,15 @@
 exports[`Wallet with BCH balances 1`] = `
 Array [
   <div
-    className="sc-kvZOFW jvlKQI"
+    className="sc-dVhcbM brpysj"
   >
     <h4
-      className="sc-tilXH iBpvxw"
+      className="sc-ksYbfQ fwolRo"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-jbKcbu jvSmvX"
+      className="sc-fAjcbJ cmsHYG"
     >
       0
        
@@ -19,26 +19,26 @@
     </div>
   </div>,
   <div
-    className="sc-hmzhuo fdoIFO"
+    className="sc-fBuWsC jTHIvX"
   >
     <div
-      className="sc-hEsumM lnGkUP"
+      className="sc-hmzhuo keMYNP"
     >
       <button
-        className="sc-ktHwxA kTMqyh"
+        className="sc-frDJqD dvoSs"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-ktHwxA hwqvnZ"
+        className="sc-frDJqD hAXDWa"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-cIShpX dpMKQe"
+      className="sc-kvZOFW dlkEwj"
     >
       <div />
       <span
@@ -65,10 +65,10 @@
        to send to others
     </div>
     <div
-      className="sc-cIShpX gUgrLH"
+      className="sc-kvZOFW ueEEv"
     >
       <a
-        className="sc-cmTdod kBIxIv"
+        className="sc-jqCOkK bCWWQD"
         href="/tokens"
         onClick={[Function]}
       >
@@ -87,15 +87,15 @@
 exports[`Wallet with BCH balances and tokens 1`] = `
 Array [
   <div
-    className="sc-kvZOFW jvlKQI"
+    className="sc-dVhcbM brpysj"
   >
     <h4
-      className="sc-tilXH iBpvxw"
+      className="sc-ksYbfQ fwolRo"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-jbKcbu jvSmvX"
+      className="sc-fAjcbJ cmsHYG"
     >
       0
        
@@ -103,26 +103,26 @@
     </div>
   </div>,
   <div
-    className="sc-hmzhuo fdoIFO"
+    className="sc-fBuWsC jTHIvX"
   >
     <div
-      className="sc-hEsumM lnGkUP"
+      className="sc-hmzhuo keMYNP"
     >
       <button
-        className="sc-ktHwxA kTMqyh"
+        className="sc-frDJqD dvoSs"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-ktHwxA hwqvnZ"
+        className="sc-frDJqD hAXDWa"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-cIShpX dpMKQe"
+      className="sc-kvZOFW dlkEwj"
     >
       <div />
       <span
@@ -149,10 +149,10 @@
        to send to others
     </div>
     <div
-      className="sc-cIShpX gUgrLH"
+      className="sc-kvZOFW ueEEv"
     >
       <a
-        className="sc-cmTdod kBIxIv"
+        className="sc-jqCOkK bCWWQD"
         href="/tokens"
         onClick={[Function]}
       >
@@ -171,15 +171,15 @@
 exports[`Wallet with BCH balances and tokens and state field 1`] = `
 Array [
   <div
-    className="sc-kvZOFW jvlKQI"
+    className="sc-dVhcbM brpysj"
   >
     <h4
-      className="sc-tilXH iBpvxw"
+      className="sc-ksYbfQ fwolRo"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-jbKcbu jvSmvX"
+      className="sc-fAjcbJ cmsHYG"
     >
       0.06
        
@@ -187,26 +187,26 @@
     </div>
   </div>,
   <div
-    className="sc-hmzhuo fdoIFO"
+    className="sc-fBuWsC jTHIvX"
   >
     <div
-      className="sc-hEsumM lnGkUP"
+      className="sc-hmzhuo keMYNP"
     >
       <button
-        className="sc-ktHwxA kTMqyh"
+        className="sc-frDJqD dvoSs"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-ktHwxA hwqvnZ"
+        className="sc-frDJqD hAXDWa"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-cIShpX dpMKQe"
+      className="sc-kvZOFW dlkEwj"
     >
       <div />
       <span
@@ -233,10 +233,10 @@
        to send to others
     </div>
     <div
-      className="sc-cIShpX gUgrLH"
+      className="sc-kvZOFW ueEEv"
     >
       <a
-        className="sc-cmTdod kBIxIv"
+        className="sc-jqCOkK bCWWQD"
         href="/tokens"
         onClick={[Function]}
       >
@@ -248,13 +248,13 @@
           onClick={[Function]}
         >
           <div
-            className="sc-iAyFgw fIykat"
+            className="sc-cSHVUG bDBPfD"
           >
             <div
-              className="sc-kkGfuU bUZIBS"
+              className="sc-jzJRlG kisVNa"
             >
               <div
-                className="sc-kEYyzF edBbzK"
+                className="sc-fjdhpX irfiDO"
               />
               <h4>
                 TBS
@@ -274,15 +274,15 @@
 exports[`Wallet without BCH balance 1`] = `
 Array [
   <div
-    className="sc-kvZOFW jvlKQI"
+    className="sc-dVhcbM brpysj"
   >
     <h4
-      className="sc-tilXH iBpvxw"
+      className="sc-ksYbfQ fwolRo"
     >
       MigrationTestAlpha
     </h4>
     <div
-      className="sc-jbKcbu jvSmvX"
+      className="sc-fAjcbJ cmsHYG"
     >
       0
        
@@ -290,26 +290,26 @@
     </div>
   </div>,
   <div
-    className="sc-hmzhuo fdoIFO"
+    className="sc-fBuWsC jTHIvX"
   >
     <div
-      className="sc-hEsumM lnGkUP"
+      className="sc-hmzhuo keMYNP"
     >
       <button
-        className="sc-ktHwxA kTMqyh"
+        className="sc-frDJqD dvoSs"
         onClick={[Function]}
       >
         Transactions
       </button>
       <button
-        className="sc-ktHwxA hwqvnZ"
+        className="sc-frDJqD hAXDWa"
         onClick={[Function]}
       >
         eTokens
       </button>
     </div>
     <div
-      className="sc-cIShpX dpMKQe"
+      className="sc-kvZOFW dlkEwj"
     >
       <div />
       <span
@@ -336,10 +336,10 @@
        to send to others
     </div>
     <div
-      className="sc-cIShpX gUgrLH"
+      className="sc-kvZOFW ueEEv"
     >
       <a
-        className="sc-cmTdod kBIxIv"
+        className="sc-jqCOkK bCWWQD"
         href="/tokens"
         onClick={[Function]}
       >
@@ -356,94 +356,80 @@
 `;
 
 exports[`Without wallet defined 1`] = `
-<div
-  className="sc-jKJlTe dtdOPB"
->
-  <h2>
-    Welcome to Cashtab!
-  </h2>
-  <p
-    className="sc-eNQAEJ jDkKnj"
+Array [
+  <div
+    className="sc-dVhcbM brpysj"
   >
-    Cashtab is an
-     
-    <a
-      className="sc-hMqMXs JqwcT"
-      href="https://github.com/bitcoin-abc/bitcoin-abc"
-      rel="noreferrer"
-      target="_blank"
-    >
-      open source,
-    </a>
-     
-    non-custodial web wallet for 
-    eCash
-    .
-    <br />
-    <br />
-    Want to learn more?
-     
-    <a
-      className="sc-hMqMXs JqwcT"
-      href="https://docs.cashtab.com/docs/"
-      rel="noreferrer"
-      target="_blank"
+    <div
+      className="sc-fAjcbJ cmsHYG"
     >
-      Check out the Cashtab documentation.
-    </a>
-  </p>
-  <button
-    className="sc-kGXeez fPsebQ"
-    onClick={[Function]}
+      0
+       
+      XEC
+    </div>
+  </div>,
+  <div
+    className="sc-fBuWsC jTHIvX"
   >
-    <span
-      aria-label="plus-square"
-      className="anticon anticon-plus-square"
-      role="img"
+    <div
+      className="sc-hmzhuo keMYNP"
     >
-      <svg
-        aria-hidden="true"
-        data-icon="plus-square"
-        fill="currentColor"
-        focusable="false"
-        height="1em"
-        viewBox="64 64 896 896"
-        width="1em"
+      <button
+        className="sc-frDJqD dvoSs"
+        onClick={[Function]}
       >
-        <path
-          d="M328 544h152v152c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V544h152c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8H544V328c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v152H328c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8z"
-        />
-        <path
-          d="M880 112H144c-17.7 0-32 14.3-32 32v736c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V144c0-17.7-14.3-32-32-32zm-40 728H184V184h656v656z"
-        />
-      </svg>
-    </span>
-     New Wallet
-  </button>
-  <button
-    className="sc-kpOJdX jLOxVU"
-    onClick={[Function]}
-  >
-    <span
-      aria-label="import"
-      className="anticon anticon-import"
-      role="img"
+        Transactions
+      </button>
+      <button
+        className="sc-frDJqD hAXDWa"
+        onClick={[Function]}
+      >
+        eTokens
+      </button>
+    </div>
+    <div
+      className="sc-kvZOFW dlkEwj"
+    >
+      <div />
+      <span
+        aria-label="party emoji"
+        role="img"
+      >
+        🎉
+      </span>
+      Congratulations on your new wallet!
+       
+      <span
+        aria-label="party emoji"
+        role="img"
+      >
+        🎉
+      </span>
+      <br />
+       Start using the wallet immediately to receive
+       
+      XEC
+       payments, or load it up with
+       
+      XEC
+       to send to others
+    </div>
+    <div
+      className="sc-kvZOFW ueEEv"
     >
-      <svg
-        aria-hidden="true"
-        data-icon="import"
-        fill="currentColor"
-        focusable="false"
-        height="1em"
-        viewBox="64 64 896 896"
-        width="1em"
+      <a
+        className="sc-jqCOkK bCWWQD"
+        href="/tokens"
+        onClick={[Function]}
       >
-        <path
-          d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7zM902 476H588v-76c0-6.7-7.8-10.5-13-6.3l-141.9 112a8 8 0 000 12.6l141.9 112c5.3 4.2 13 .4 13-6.3v-76h314c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z"
-        />
-      </svg>
-    </span>
-     Import Wallet
-  </button>
-</div>
+        Create eToken
+      </a>
+      <p>
+        Tokens sent to your 
+        eToken
+         address will appear here
+      </p>
+    </div>
+  </div>,
+]
 `;
diff --git a/web/cashtab/src/components/Send/Send.js b/web/cashtab/src/components/Send/Send.js
--- a/web/cashtab/src/components/Send/Send.js
+++ b/web/cashtab/src/components/Send/Send.js
@@ -61,7 +61,6 @@
 import styled from 'styled-components';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import WalletLabel from 'components/Common/WalletLabel.js';
-
 const { TextArea } = Input;
 
 const SignMessageLabel = styled.div`
diff --git a/web/cashtab/src/components/Tokens/Tokens.js b/web/cashtab/src/components/Tokens/Tokens.js
--- a/web/cashtab/src/components/Tokens/Tokens.js
+++ b/web/cashtab/src/components/Tokens/Tokens.js
@@ -14,7 +14,6 @@
 } from 'components/Common/Atoms';
 import ApiError from 'components/Common/ApiError';
 import WalletLabel from 'components/Common/WalletLabel.js';
-
 const Tokens = ({ jestBCH, passLoadingStatus }) => {
     const { wallet, apiError, fiatPrice, cashtabSettings } =
         React.useContext(WalletContext);