diff --git a/services/registration/edit_family_name.vis b/services/registration/edit_family_name.vis
index 590eab1..6751766 100644
--- a/services/registration/edit_family_name.vis
+++ b/services/registration/edit_family_name.vis
@@ -5,6 +5,7 @@ RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
+INCMP _ 0
 RELOAD set_back 
 CATCH _ flag_back_set 1
 LOAD save_familyname 64
@@ -15,4 +16,3 @@ CATCH edit_yob flag_yob_set 0
 CATCH edit_location flag_location_set 0
 CATCH edit_offerings flag_offerings_set 0
 CATCH pin_entry flag_familyname_set 0
-INCMP select_gender *
diff --git a/services/registration/edit_first_name.vis b/services/registration/edit_first_name.vis
index 6848b9c..835f2bb 100644
--- a/services/registration/edit_first_name.vis
+++ b/services/registration/edit_first_name.vis
@@ -5,6 +5,7 @@ RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
+INCMP _ 0
 RELOAD set_back 
 CATCH _ flag_back_set 1
 LOAD save_firstname 128
diff --git a/services/registration/edit_location.vis b/services/registration/edit_location.vis
index e4fcd8b..17076ca 100644
--- a/services/registration/edit_location.vis
+++ b/services/registration/edit_location.vis
@@ -5,11 +5,10 @@ RELOAD get_current_profile_info
 LOAD save_location 16
 MOUT back 0
 HALT
-RELOAD set_back 
+INCMP _ 0
+RELOAD set_back
 CATCH _ flag_back_set 1
 RELOAD save_location
-INCMP _ 0
 CATCH pin_entry flag_location_set 1
 CATCH edit_offerings flag_offerings_set 0
 CATCH pin_entry flag_location_set 0
-INCMP edit_offerings *
diff --git a/services/registration/edit_offerings.vis b/services/registration/edit_offerings.vis
index ddbc9e0..9ce1407 100644
--- a/services/registration/edit_offerings.vis
+++ b/services/registration/edit_offerings.vis
@@ -5,6 +5,7 @@ RELOAD get_current_profile_info
 LOAD save_offerings 8
 MOUT back 0
 HALT
+INCMP _ 0
 RELOAD set_back 
 CATCH _ flag_back_set 1
 RELOAD save_offerings
diff --git a/services/registration/edit_yob.vis b/services/registration/edit_yob.vis
index 255bea5..e65f1c9 100644
--- a/services/registration/edit_yob.vis
+++ b/services/registration/edit_yob.vis
@@ -5,6 +5,7 @@ RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
+INCMP _ 0
 RELOAD set_back 
 CATCH _ flag_back_set 1
 LOAD verify_yob 6