diff --git a/services/registration/edit_profile.vis b/services/registration/edit_profile.vis
index 6c1986f..9d45ec9 100644
--- a/services/registration/edit_profile.vis
+++ b/services/registration/edit_profile.vis
@@ -11,8 +11,6 @@ MOUT view 7
 MOUT back 0
 HALT
 INCMP my_account 0
-LOAD set_reset_single_edit 0
-RELOAD set_reset_single_edit
 INCMP enter_name 1
 INCMP enter_familyname 2
 INCMP select_gender 3
diff --git a/services/registration/select_gender.vis b/services/registration/select_gender.vis
index 25e53d3..1082cef 100644
--- a/services/registration/select_gender.vis
+++ b/services/registration/select_gender.vis
@@ -1,13 +1,15 @@
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH profile_update_success flag_allow_update 1
-LOAD save_gender 0
 MOUT male 1
 MOUT female 2
 MOUT unspecified 3
 MOUT back 0
 HALT
-RELOAD save_gender
 INCMP _ 0
-INCMP pin_entry *
+INCMP set_male 1
+INCMP set_female 2
+INCMP set_unspecified 3
+
+
 
 
diff --git a/services/registration/select_language.vis b/services/registration/select_language.vis
index aa83e0c..54f08e9 100644
--- a/services/registration/select_language.vis
+++ b/services/registration/select_language.vis
@@ -1,6 +1,6 @@
 MOUT english 0
 MOUT kiswahili 1
 HALT
-INCMP set_default 0
+INCMP set_eng 0
 INCMP set_swa 1
 INCMP . *
diff --git a/services/registration/set_default.vis b/services/registration/set_eng.vis
similarity index 100%
rename from services/registration/set_default.vis
rename to services/registration/set_eng.vis
diff --git a/services/registration/set_female.vis b/services/registration/set_female.vis
new file mode 100644
index 0000000..723b080
--- /dev/null
+++ b/services/registration/set_female.vis
@@ -0,0 +1,4 @@
+LOAD save_gender 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH profile_update_success flag_allow_update 1
+MOVE pin_entry
diff --git a/services/registration/set_male.vis b/services/registration/set_male.vis
new file mode 100644
index 0000000..723b080
--- /dev/null
+++ b/services/registration/set_male.vis
@@ -0,0 +1,4 @@
+LOAD save_gender 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH profile_update_success flag_allow_update 1
+MOVE pin_entry
diff --git a/services/registration/set_unspecified.vis b/services/registration/set_unspecified.vis
new file mode 100644
index 0000000..723b080
--- /dev/null
+++ b/services/registration/set_unspecified.vis
@@ -0,0 +1,4 @@
+LOAD save_gender 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH profile_update_success flag_allow_update 1
+MOVE pin_entry