diff --git a/services/registration/edit_family_name.vis b/services/registration/edit_family_name.vis
index 8b76f1d..de067c5 100644
--- a/services/registration/edit_family_name.vis
+++ b/services/registration/edit_family_name.vis
@@ -3,6 +3,5 @@ RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
-LOAD save_familyname 32
 INCMP _ 0
 INCMP edit_family_name_next *
diff --git a/services/registration/edit_family_name_next.vis b/services/registration/edit_family_name_next.vis
index 2e81955..bc1f858 100644
--- a/services/registration/edit_family_name_next.vis
+++ b/services/registration/edit_family_name_next.vis
@@ -1,3 +1,4 @@
+LOAD save_familyname 32
 RELOAD save_familyname
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_familyname flag_allow_update 1
diff --git a/services/registration/edit_first_name.vis b/services/registration/edit_first_name.vis
index 9adb546..95c2dc1 100644
--- a/services/registration/edit_first_name.vis
+++ b/services/registration/edit_first_name.vis
@@ -3,6 +3,5 @@ RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
-LOAD save_firstname 64
 INCMP _ 0
 INCMP edit_first_name_next *
diff --git a/services/registration/edit_first_name_next.vis b/services/registration/edit_first_name_next.vis
index b557580..41e797d 100644
--- a/services/registration/edit_first_name_next.vis
+++ b/services/registration/edit_first_name_next.vis
@@ -1,3 +1,4 @@
+LOAD save_firstname 64
 RELOAD save_firstname
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_firstname flag_allow_update 1
diff --git a/services/registration/edit_location.vis b/services/registration/edit_location.vis
index d097a7d..0869e48 100644
--- a/services/registration/edit_location.vis
+++ b/services/registration/edit_location.vis
@@ -1,9 +1,7 @@
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
-LOAD save_location 16
 MOUT back 0
 HALT
-RELOAD save_location
 INCMP _ 0
 INCMP edit_location_next *
 
diff --git a/services/registration/edit_location_next.vis b/services/registration/edit_location_next.vis
index 86074e7..7f2c1c5 100644
--- a/services/registration/edit_location_next.vis
+++ b/services/registration/edit_location_next.vis
@@ -1,3 +1,5 @@
+LOAD save_location 16
+RELOAD save_location
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_location flag_allow_update 1
 RELOAD set_back
diff --git a/services/registration/edit_offerings.vis b/services/registration/edit_offerings.vis
index d8ae703..4f91551 100644
--- a/services/registration/edit_offerings.vis
+++ b/services/registration/edit_offerings.vis
@@ -1,9 +1,7 @@
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
-LOAD save_offerings 8
 MOUT back 0
 HALT
-RELOAD save_offerings
 INCMP _ 0
 INCMP edit_offerings_next *
 
diff --git a/services/registration/edit_offerings_next.vis b/services/registration/edit_offerings_next.vis
index 9477382..d504781 100644
--- a/services/registration/edit_offerings_next.vis
+++ b/services/registration/edit_offerings_next.vis
@@ -1,3 +1,5 @@
+LOAD save_offerings 8
+RELOAD save_offerings
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_offerings flag_allow_update 1
 RELOAD set_back 
diff --git a/services/registration/edit_yob.vis b/services/registration/edit_yob.vis
index 36923fd..0701c21 100644
--- a/services/registration/edit_yob.vis
+++ b/services/registration/edit_yob.vis
@@ -1,11 +1,7 @@
 LOAD get_current_profile_info 0
-LOAD save_yob 16
 RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
 HALT
-LOAD verify_yob 0
-RELOAD verify_yob
-RELOAD save_yob
 INCMP _ 0
 INCMP edit_yob_next *
diff --git a/services/registration/edit_yob_next.vis b/services/registration/edit_yob_next.vis
index 4ab2bf2..cc45580 100644
--- a/services/registration/edit_yob_next.vis
+++ b/services/registration/edit_yob_next.vis
@@ -1,3 +1,7 @@
+LOAD save_yob 16
+LOAD verify_yob 8
+RELOAD verify_yob
+RELOAD save_yob
 CATCH incorrect_date_format flag_incorrect_date_format 1
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH update_yob flag_allow_update 1