diff --git a/services/registration/swap_initiated.vis b/services/registration/swap_initiated.vis
index d2018aa..eaa7907 100644
--- a/services/registration/swap_initiated.vis
+++ b/services/registration/swap_initiated.vis
@@ -1,3 +1,5 @@
 LOAD reset_incorrect_pin 6
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH _ flag_account_authorized 0
 LOAD initiate_swap 0
 HALT
diff --git a/services/registration/swap_preview.vis b/services/registration/swap_preview.vis
index e7c2b97..7e5276a 100644
--- a/services/registration/swap_preview.vis
+++ b/services/registration/swap_preview.vis
@@ -7,7 +7,6 @@ LOAD authorize_account 6
 HALT
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH . flag_account_authorized 0
 INCMP _ 0
 INCMP quit 9
 INCMP swap_initiated *