diff --git a/services/registration/enter_loca b/services/registration/enter_location
similarity index 100%
rename from services/registration/enter_loca
rename to services/registration/enter_location
diff --git a/services/registration/enter_loca.vis b/services/registration/enter_location.vis
similarity index 67%
rename from services/registration/enter_loca.vis
rename to services/registration/enter_location.vis
index effecb0..9245bb1 100644
--- a/services/registration/enter_loca.vis
+++ b/services/registration/enter_location.vis
@@ -1,3 +1,4 @@
+CATCH incorrect_date_format 21 1
 LOAD save_yob 0
 MOUT back 0
 HALT
diff --git a/services/registration/enter_loca_swa b/services/registration/enter_location_swa
similarity index 100%
rename from services/registration/enter_loca_swa
rename to services/registration/enter_location_swa
diff --git a/services/registration/enter_off b/services/registration/enter_offerings
similarity index 100%
rename from services/registration/enter_off
rename to services/registration/enter_offerings
diff --git a/services/registration/enter_off_swa b/services/registration/enter_offerings_swa
similarity index 100%
rename from services/registration/enter_off_swa
rename to services/registration/enter_offerings_swa
diff --git a/services/registration/enter_yob.vis b/services/registration/enter_yob.vis
index d169e05..0a5b778 100644
--- a/services/registration/enter_yob.vis
+++ b/services/registration/enter_yob.vis
@@ -2,4 +2,5 @@ LOAD save_gender 0
 MOUT back 0
 HALT
 INCMP _ 0
+LOAD verify_yob 8
 INCMP enter_location *
diff --git a/services/registration/incorrect_date_format b/services/registration/incorrect_date_format
new file mode 100644
index 0000000..517ea52
--- /dev/null
+++ b/services/registration/incorrect_date_format
@@ -0,0 +1,2 @@
+Unsuported date format
+Please provide date format as 12/01/1972
diff --git a/services/registration/incorrect_date_format.vis b/services/registration/incorrect_date_format.vis
new file mode 100644
index 0000000..e94db5d
--- /dev/null
+++ b/services/registration/incorrect_date_format.vis
@@ -0,0 +1,6 @@
+LOAD reset_incorrect_date_format 8
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP enter_yob 1
+INCMP quit 9
diff --git a/services/registration/incorrect_date_format_swa b/services/registration/incorrect_date_format_swa
new file mode 100644
index 0000000..e69de29