diff --git a/src/status_im2/contexts/onboarding/events.cljs b/src/status_im2/contexts/onboarding/events.cljs
index 7cee556378..f46e0d0281 100644
--- a/src/status_im2/contexts/onboarding/events.cljs
+++ b/src/status_im2/contexts/onboarding/events.cljs
@@ -74,10 +74,13 @@
 (rf/defn password-set
   {:events [:onboarding-2/password-set]}
   [{:keys [db]} password]
-  {:db       (-> db
-                 (assoc-in [:onboarding-2/profile :password] password)
-                 (assoc-in [:onboarding-2/profile :auth-method] constants/auth-method-password))
-   :dispatch [:navigate-to :enable-biometrics]})
+  (let [supported-type (:biometric/supported-type db)]
+    {:db       (-> db
+                   (assoc-in [:onboarding-2/profile :password] password)
+                   (assoc-in [:onboarding-2/profile :auth-method] constants/auth-method-password))
+     :dispatch (if supported-type
+                 [:navigate-to :enable-biometrics]
+                 [:onboarding-2/create-account-and-login])}))
 
 (rf/defn seed-phrase-entered
   {:events [:onboarding-2/seed-phrase-entered]}
diff --git a/test/appium/views/sign_in_view.py b/test/appium/views/sign_in_view.py
index 507a4e7aaa..ceba66e2d0 100644
--- a/test/appium/views/sign_in_view.py
+++ b/test/appium/views/sign_in_view.py
@@ -225,7 +225,8 @@ class SignInView(BaseView):
             self.generate_keys_button.click_until_presence_of_element(self.profile_your_name_edit_box)
         self.set_profile(username)
         self.set_password(password)
-        self.enable_biometric_maybe_later_button.wait_and_click(30)
+        if self.enable_biometric_maybe_later_button.is_element_displayed(30):
+            self.enable_biometric_maybe_later_button.click()
         # self.next_button.click_until_absense_of_element(self.element_by_translation_id("intro-wizard-title2"))
         # if keycard:
         #     keycard_flow = self.keycard_storage_button.click()