diff --git a/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml b/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml
index 606437ca7c..4e35ad2b0c 100644
--- a/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml
+++ b/ui/app/AppLayouts/Onboarding/OnboardingLayout.qml
@@ -9,6 +9,7 @@ QtObject {
     id: root
     property bool hasAccounts
     property string keysMainSetState: ""
+    property string prevState: ""
 
     signal loadApp()
     signal onBoardingStepChanged(var view, string state)
@@ -197,7 +198,7 @@ QtObject {
                 Global.applicationWindow.navigateTo("ImportSeed");
             }
             onBackClicked: {
-                if (root.keysMainSetState === "connectkeys" && LoginStore.currentAccount.username !== "") {
+                if ((root.keysMainSetState === "connectkeys" && LoginStore.currentAccount.username !== "") || root.prevState === "LogIn") {
                     Global.applicationWindow.navigateTo("LogIn");
                 } else {
                     Global.applicationWindow.navigateTo("Welcome");
@@ -255,11 +256,14 @@ QtObject {
     property var loginComponent: Component {
         id: login
         LoginView {
-            onGenKeyClicked: {
-                Global.applicationWindow.navigateTo("GenKey");
+            onAddNewUserClicked: {
+                root.keysMainSetState = "getkeys";
+                root.prevState = "LogIn"
+                Global.applicationWindow.navigateTo("KeysMain");
             }
             onAddExistingKeyClicked: {
                 root.keysMainSetState = "connectkeys";
+                root.prevState = "LogIn"
                 Global.applicationWindow.navigateTo("KeysMain");
             }
         }
diff --git a/ui/app/AppLayouts/Onboarding/panels/AccountMenuItemPanel.qml b/ui/app/AppLayouts/Onboarding/panels/AccountMenuItemPanel.qml
index e6368c1f84..907a7e493f 100644
--- a/ui/app/AppLayouts/Onboarding/panels/AccountMenuItemPanel.qml
+++ b/ui/app/AppLayouts/Onboarding/panels/AccountMenuItemPanel.qml
@@ -17,6 +17,9 @@ MenuItem {
     property string colorId: ""
     property var colorHash
     property url image: ""
+    property StatusIconSettings iconSettings: StatusIconSettings {
+      name: "add"
+    }
     signal clicked()
 
     width: parent.width
@@ -43,7 +46,7 @@ MenuItem {
     Component {
         id: addIcon
         StatusRoundIcon {
-            icon.name: "add"
+            icon.name: root.iconSettings.name
         }
     }
 
diff --git a/ui/app/AppLayouts/Onboarding/views/LoginView.qml b/ui/app/AppLayouts/Onboarding/views/LoginView.qml
index 40e5c92a38..3ba98f84e4 100644
--- a/ui/app/AppLayouts/Onboarding/views/LoginView.qml
+++ b/ui/app/AppLayouts/Onboarding/views/LoginView.qml
@@ -24,7 +24,7 @@ import utils 1.0
 
 Item {
     property bool loading: false
-    signal genKeyClicked()
+    signal addNewUserClicked()
     signal addExistingKeyClicked()
 
     id: loginView
@@ -197,10 +197,19 @@ Item {
                   }
 
                   AccountMenuItemPanel {
-                    label: qsTr("Generate new account")
+                    label: qsTr("Add new user")
                     onClicked: {
                       accountsPopup.close()
-                      genKeyClicked();
+                      addNewUserClicked();
+                    }
+                  }
+
+                  AccountMenuItemPanel {
+                    label: qsTr("Add existing Status user")
+                    iconSettings.name: "wallet"
+                    onClicked: {
+                      accountsPopup.close()
+                      addExistingKeyClicked();
                     }
                   }
               }