diff --git a/services/registration/community_balance.vis b/services/registration/community_balance.vis
index 4894944..c25ced3 100644
--- a/services/registration/community_balance.vis
+++ b/services/registration/community_balance.vis
@@ -1,5 +1,5 @@
 LOAD reset_incorrect 0
-CATCH incorrect_pin 15 1
-CATCH pin_entry 12 0
+CATCH incorrect_pin incorrect_pin_flag 1
+CATCH pin_entry account_authorized_flag 0
 LOAD quit_with_balance 0
 HALT
diff --git a/services/registration/enter_location.vis b/services/registration/enter_location.vis
index f6ccf77..6d9bc03 100644
--- a/services/registration/enter_location.vis
+++ b/services/registration/enter_location.vis
@@ -1,11 +1,11 @@
 CATCH incorrect_date_format 21 1
 LOAD save_yob 0
-CATCH update_success 16 1
+CATCH update_success allow_update_flag 1
 MOUT back 0
 HALT
 INCMP _ 0
 LOAD save_location 0
-CATCH pin_entry 23 1
+CATCH pin_entry single_edit_flag 1
 INCMP enter_offerings *
 
 
diff --git a/services/registration/enter_offerings.vis b/services/registration/enter_offerings.vis
index f48f1ea..9bc4407 100644
--- a/services/registration/enter_offerings.vis
+++ b/services/registration/enter_offerings.vis
@@ -1,6 +1,6 @@
 LOAD save_location 0
-CATCH incorrect_pin 15 1
-CATCH update_success 16 1
+CATCH incorrect_pin incorrect_pin_flag 1
+CATCH update_success allow_update_flag 1
 MOUT back 0
 HALT
 LOAD save_offerings 0
diff --git a/services/registration/enter_yob.vis b/services/registration/enter_yob.vis
index 3b3f0d2..46a3771 100644
--- a/services/registration/enter_yob.vis
+++ b/services/registration/enter_yob.vis
@@ -1,9 +1,9 @@
 LOAD save_gender 0
-CATCH update_success 16 1
+CATCH update_success allow_update_flag 1
 MOUT back 0
 HALT
 INCMP _ 0
 LOAD verify_yob 8
 LOAD save_yob 0
-CATCH pin_entry 23 1
+CATCH pin_entry single_edit_flag 1
 INCMP enter_location *
diff --git a/services/registration/my_balance.vis b/services/registration/my_balance.vis
index 4894944..c25ced3 100644
--- a/services/registration/my_balance.vis
+++ b/services/registration/my_balance.vis
@@ -1,5 +1,5 @@
 LOAD reset_incorrect 0
-CATCH incorrect_pin 15 1
-CATCH pin_entry 12 0
+CATCH incorrect_pin incorrect_pin_flag 1
+CATCH pin_entry account_authorized_flag 0
 LOAD quit_with_balance 0
 HALT
diff --git a/services/registration/select_gender.vis b/services/registration/select_gender.vis
index 3029406..1159c64 100644
--- a/services/registration/select_gender.vis
+++ b/services/registration/select_gender.vis
@@ -1,12 +1,12 @@
 LOAD save_familyname 0
-CATCH update_success 16 1
+CATCH update_success allow_update_flag 1
 MOUT male 1
 MOUT female 2
 MOUT unspecified 3
 MOUT back 0
 HALT
 LOAD save_gender 0
-CATCH pin_entry 23 1
+CATCH pin_entry single_edit_flag 1
 INCMP _ 0
 INCMP enter_yob 1
 INCMP enter_yob 2
diff --git a/services/registration/view_profile.vis b/services/registration/view_profile.vis
index 8bf2b76..bf1196b 100644
--- a/services/registration/view_profile.vis
+++ b/services/registration/view_profile.vis
@@ -1,8 +1,8 @@
 LOAD get_profile_info 0
 MAP get_profile_info 
 LOAD reset_incorrect 0
-CATCH incorrect_pin 15 1
-CATCH pin_entry 12 0
+CATCH incorrect_pin incorrect_pin_flag 1
+CATCH pin_entry account_authorized_flag 0
 MOUT back 0
 HALT
 INCMP _ 0