diff --git a/src/status_im/accounts/handlers.cljs b/src/status_im/accounts/handlers.cljs
index cc6fa53933..14a4e69f8a 100644
--- a/src/status_im/accounts/handlers.cljs
+++ b/src/status_im/accounts/handlers.cljs
@@ -46,7 +46,6 @@
         (dispatch-sync [:login-account address password])))))
 
 (register-handler :create-account
-  (after #(dispatch [:init-wallet-chat]))
   (u/side-effect!
     (fn [_ [_ password]]
       (status/create-account
diff --git a/src/status_im/chat/handlers.cljs b/src/status_im/chat/handlers.cljs
index 4eb69f9b27..3a9335305a 100644
--- a/src/status_im/chat/handlers.cljs
+++ b/src/status_im/chat/handlers.cljs
@@ -211,6 +211,7 @@
     (sign-up-service/stop-listening-confirmation-code-sms db)))
 
 (register-handler :sign-up-confirm
+  (after #(dispatch [:init-wallet-chat]))
   (u/side-effect!
     (fn [_ [_ confirmation-code]]
       (server/sign-up-confirm confirmation-code sign-up-service/on-send-code-response))))
diff --git a/src/status_im/chat/handlers/animation.cljs b/src/status_im/chat/handlers/animation.cljs
index 6bfa1ba592..3022e84dfb 100644
--- a/src/status_im/chat/handlers/animation.cljs
+++ b/src/status_im/chat/handlers/animation.cljs
@@ -52,7 +52,7 @@
             response? (+ minimum-suggestion-height)
             command? (+ input-height)
             (and suggestion? command?) (+ suggestions-header-height)
-            custom-errors? (+ suggestions-header-height)
+            ;custom-errors? (+ suggestions-header-height)
             (and command? validation-errors?) (+ suggestions-header-height))))
 
 (register-handler :animate-show-response