diff --git a/packages/shared/lib/app.ts b/packages/shared/lib/app.ts
index 712717117ff..46cb654e608 100644
--- a/packages/shared/lib/app.ts
+++ b/packages/shared/lib/app.ts
@@ -6,11 +6,6 @@ import { activeProfile, clearActiveProfile, isStrongholdLocked } from './profile
 import { resetRouter } from './router'
 import { api, destroyActor, resetWallet } from './wallet'
 
-/**
- * Notification content
- */
-export const notification = writable<string>(null)
-
 /**
  * Mobile mode
  */
@@ -49,6 +44,28 @@ export const clearSendParams = () => sendParams.set({ amount: 0, address: '', me
 export const loggedIn = writable<boolean>(false)
 
 /**
+ * Determines if user can make developer profiles
+ */
+export const developerMode = persistent<boolean>('developerMode', false)
+
+/**
+ * Cleanup the signup vars
+ */
+ export const cleanupSignup = () => {
+    mnemonic.set(null)
+    strongholdPassword.set(null)
+    walletPin.set(null)
+}
+
+/**
+ * Log in to the current profile
+ */
+export const login = () => {
+    loggedIn.set(true)
+}
+
+/**
+
  * Logout from current profile
  */
 export const logout = () => {
@@ -64,7 +81,7 @@ export const logout = () => {
         resetWallet()
         resetRouter()
         clearActiveProfile()
-        mnemonic.set(null)
+        loggedIn.set(false)
     }
 
     if (!get(isStrongholdLocked)) {
diff --git a/packages/shared/lib/router.ts b/packages/shared/lib/router.ts
index 041b8200555..86bfec0aa8b 100644
--- a/packages/shared/lib/router.ts
+++ b/packages/shared/lib/router.ts
@@ -1,4 +1,4 @@
-import { loggedIn, notification, strongholdPassword, walletPin } from 'shared/lib/app'
+import { cleanupSignup, login, strongholdPassword, walletPin } from 'shared/lib/app'
 import { profiles } from 'shared/lib/profile'
 import { AccountRoutes, AppRoute, SettingsRoutes, SetupType, Tabs, WalletRoutes } from 'shared/lib/typings/routes'
 import { get, readable, writable } from 'svelte/store'
@@ -24,7 +24,6 @@ export const path = readable<string>(null, (set) => {
     const updatePath = (): void => {
         const pathName = window.location.hash.substr(1)
         set(pathName)
-        notification.set(null)
     }
 
     window.addEventListener('hashchange', updatePath)
@@ -101,7 +100,7 @@ export const routerNext = (event) => {
             if (shouldAddProfile) {
                 nextRoute = AppRoute.Setup
             } else {
-                loggedIn.set(true)
+                login()
                 nextRoute = AppRoute.Dashboard
             }
             break
@@ -176,7 +175,8 @@ export const routerNext = (event) => {
             nextRoute = AppRoute.Congratulations
             break
         case AppRoute.Congratulations:
-            loggedIn.set(true)
+            cleanupSignup()
+            login()
             nextRoute = AppRoute.Dashboard
             break
     }
@@ -221,5 +221,4 @@ export const resetRouter = () => {
     settingsRoute.set(SettingsRoutes.Init)
     dashboardRoute.set(Tabs.Wallet)
     deepLinkRequestActive.set(false)
-    loggedIn.set(false)
 }
diff --git a/packages/shared/routes/dashboard/wallet/views/WalletActions.svelte b/packages/shared/routes/dashboard/wallet/views/WalletActions.svelte
index dcf2a0dc6e8..095d3c3effc 100644
--- a/packages/shared/routes/dashboard/wallet/views/WalletActions.svelte
+++ b/packages/shared/routes/dashboard/wallet/views/WalletActions.svelte
@@ -1,5 +1,6 @@
 <script lang="typescript">
     import { AccountTile, Button, Text } from 'shared/components'
+    import { loggedIn } from 'shared/lib/app'
     import { closePopup, openPopup } from 'shared/lib/popup'
     import { accountRoute, walletRoute } from 'shared/lib/router'
     import { AccountRoutes, WalletRoutes } from 'shared/lib/typings/routes'
@@ -19,7 +20,7 @@
 
     let startInit
 
-    if ($walletRoute === WalletRoutes.Init && !$accountsLoaded) {
+    if ($walletRoute === WalletRoutes.Init && !$accountsLoaded && $loggedIn) {
         startInit = Date.now()
         openPopup({
             type: 'busy',
diff --git a/packages/shared/routes/setup/Setup.svelte b/packages/shared/routes/setup/Setup.svelte
index 873a994ef8b..46629abe6dd 100644
--- a/packages/shared/routes/setup/Setup.svelte
+++ b/packages/shared/routes/setup/Setup.svelte
@@ -1,5 +1,6 @@
 <script lang="typescript">
     import { Button, Checkbox, Illustration, Input, OnboardingLayout, Text } from 'shared/components'
+    import { cleanupSignup } from 'shared/lib/app'
     import { appSettings } from 'shared/lib/appSettings'
     import { Electron } from 'shared/lib/electron'
     import { hasOnlyWhitespaces } from 'shared/lib/helpers'
@@ -50,6 +51,7 @@
     }
 
     function handleBackClick() {
+        cleanupSignup()
         disposeNewProfile()
         dispatch('previous')
     }