diff --git a/services/registration/account_creation.vis b/services/registration/account_creation.vis
index e3ecebb..1aca453 100644
--- a/services/registration/account_creation.vis
+++ b/services/registration/account_creation.vis
@@ -1,4 +1,4 @@
 RELOAD verify_pin
-CATCH create_pin_mismatch 20 1
+CATCH create_pin_mismatch pin_mismatch_flag 1
 LOAD quit 0
 HALT
diff --git a/services/registration/account_pending.vis b/services/registration/account_pending.vis
index 19e308c..a4baae5 100644
--- a/services/registration/account_pending.vis
+++ b/services/registration/account_pending.vis
@@ -1,3 +1,3 @@
 RELOAD check_account_status
-CATCH main 11 1
+CATCH main account_success_flag 1
 HALT
diff --git a/services/registration/amount.vis b/services/registration/amount.vis
index 884c8a5..e134735 100644
--- a/services/registration/amount.vis
+++ b/services/registration/amount.vis
@@ -5,7 +5,7 @@ MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH invalid_amount 17 1
+CATCH invalid_amount invalid_amount_flag 1
 INCMP _ 0
 LOAD get_recipient 12
 LOAD get_sender 64
diff --git a/services/registration/create_pin.vis b/services/registration/create_pin.vis
index 4994863..2755b1d 100644
--- a/services/registration/create_pin.vis
+++ b/services/registration/create_pin.vis
@@ -1,9 +1,9 @@
 LOAD create_account 0
-CATCH account_creation_failed 22 1
+CATCH account_creation_failed account_creation_failed_flag 1
 MOUT exit 0
 HALT
 LOAD save_pin 0
 RELOAD save_pin
-CATCH . 15 1
+CATCH . incorrect_pin_flag 1
 INCMP quit 0
 INCMP confirm_create_pin *
diff --git a/services/registration/send.vis b/services/registration/send.vis
index d0fe211..5db5287 100644
--- a/services/registration/send.vis
+++ b/services/registration/send.vis
@@ -3,6 +3,6 @@ MOUT back 0
 HALT
 LOAD validate_recipient 20
 RELOAD validate_recipient
-CATCH invalid_recipient 13 1
+CATCH invalid_recipient invalid_recipient_flag 1
 INCMP _ 0
 INCMP amount *
diff --git a/services/registration/transaction_pin.vis b/services/registration/transaction_pin.vis
index 5113b6c..19e0fcc 100644
--- a/services/registration/transaction_pin.vis
+++ b/services/registration/transaction_pin.vis
@@ -8,7 +8,7 @@ MOUT quit 9
 HALT
 LOAD authorize_account 1
 RELOAD authorize_account
-CATCH incorrect_pin 15 1
+CATCH incorrect_pin incorrect_pin_flag 1
 INCMP _ 0
 INCMP quit 9
 MOVE transaction_initiated