diff --git a/services/registration/edit_family_name.vis b/services/registration/edit_family_name.vis
index adcede1..df35970 100644
--- a/services/registration/edit_family_name.vis
+++ b/services/registration/edit_family_name.vis
@@ -3,8 +3,8 @@ LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
 MAP get_current_profile_info
 MOUT back 0
-LOAD save_familyname 64
 HALT
+LOAD save_familyname 64
 RELOAD save_familyname
 INCMP _ 0
 CATCH pin_entry flag_familyname_set 1
diff --git a/services/registration/edit_first_name.vis b/services/registration/edit_first_name.vis
index d230945..f6bfa26 100644
--- a/services/registration/edit_first_name.vis
+++ b/services/registration/edit_first_name.vis
@@ -2,10 +2,10 @@ CATCH update_firstname flag_allow_update 1
 LOAD get_current_profile_info 0
 RELOAD get_current_profile_info
 MAP get_current_profile_info
-LOAD save_firstname 128
 MOUT back 0
 HALT
-RELOAD save_firstname
 INCMP _ 0
+LOAD save_firstname 128
+RELOAD save_firstname
 CATCH pin_entry flag_firstname_set 1
 INCMP edit_family_name *