diff --git a/src/status_im/accounts/create/core.cljs b/src/status_im/accounts/create/core.cljs
index 640773a06f..d591a59a04 100644
--- a/src/status_im/accounts/create/core.cljs
+++ b/src/status_im/accounts/create/core.cljs
@@ -38,17 +38,11 @@
 
 (defn dec-step [step]
   (let [inverted  (map-invert step-kw-to-num)]
-    ; Skip select-key-storage step
-    (if (= step :create-code)
-      :choose-key
-      (inverted (dec (step-kw-to-num step))))))
+    (inverted (dec (step-kw-to-num step)))))
 
 (defn inc-step [step]
   (let [inverted  (map-invert step-kw-to-num)]
-    ; Skip select-key-storage step
-    (if (= step :choose-key)
-      :create-code
-      (inverted (inc (step-kw-to-num step))))))
+    (inverted (inc (step-kw-to-num step)))))
 
 (defn get-status [cofx]
   (assoc cofx :status (rand-nth statuses/data)))
diff --git a/test/cljs/status_im/test/accounts/create/core.cljs b/test/cljs/status_im/test/accounts/create/core.cljs
index dfc26b7a5d..9488ec7526 100644
--- a/test/cljs/status_im/test/accounts/create/core.cljs
+++ b/test/cljs/status_im/test/accounts/create/core.cljs
@@ -24,7 +24,7 @@
   (testing "Back from create-code"
     (let [db {:intro-wizard {:step :create-code :key-code "qwerty"}}
           result (get-in (models/intro-step-back {:db db}) [:db :intro-wizard])]
-      (is (= result  {:step :choose-key :key-code nil :weak-password? true}))))
+      (is (= result  {:step :select-key-storage :key-code nil :weak-password? true}))))
 
   (testing "Back from confirm-code"
     (let [db {:intro-wizard {:step :confirm-code :confirm-failure? true}}
@@ -37,7 +37,7 @@
           ;; In this case intro-step-forward returns fx/merge result which is an fn
           ;; to be invoked on cofx
           result (get-in ((models/intro-step-forward {:db db}) {:db db}) [:db :intro-wizard])]
-      (is (= result {:step :create-code}))))
+      (is (= result {:step :select-key-storage}))))
 
   (testing "Forward from generate-key"
     (let [db {:intro-wizard {:step :generate-key}}