diff --git a/services/registration/enter_location.vis b/services/registration/enter_location.vis
index 6d9bc03..45c5c9a 100644
--- a/services/registration/enter_location.vis
+++ b/services/registration/enter_location.vis
@@ -1,4 +1,4 @@
-CATCH incorrect_date_format 21 1
+CATCH incorrect_date_format incorrect_date_format_flag 1
 LOAD save_yob 0
 CATCH update_success allow_update_flag 1
 MOUT back 0
@@ -7,6 +7,3 @@ INCMP _ 0
 LOAD save_location 0
 CATCH pin_entry single_edit_flag 1
 INCMP enter_offerings *
-
-
-
diff --git a/services/registration/root.vis b/services/registration/root.vis
index 14b77f8..3074d25 100644
--- a/services/registration/root.vis
+++ b/services/registration/root.vis
@@ -1,7 +1,7 @@
-CATCH select_language 8 0
-CATCH terms 9 0
+CATCH select_language language_set_flag 0
+CATCH terms account_created_flag 0
 LOAD check_account_status 0
-CATCH account_pending 10 1
-CATCH create_pin 18 0
-CATCH main 11 1
+CATCH account_pending account_pending_flag 1
+CATCH create_pin pin_set_flag 0
+CATCH main account_success_flag 1
 HALT