diff --git a/handlers/application/authorization.go b/handlers/application/authorization.go
index 2087632..dd12aa8 100644
--- a/handlers/application/authorization.go
+++ b/handlers/application/authorization.go
@@ -21,6 +21,7 @@ func (h *MenuHandlers) Authorize(ctx context.Context, sym string, input []byte)
 	flag_incorrect_pin, _ := h.flagManager.GetFlag("flag_incorrect_pin")
 	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
 	flag_allow_update, _ := h.flagManager.GetFlag("flag_allow_update")
+	flag_account_pin_reset, _ := h.flagManager.GetFlag("flag_account_pin_reset")
 
 	pinInput := string(input)
 
@@ -33,7 +34,9 @@ func (h *MenuHandlers) Authorize(ctx context.Context, sym string, input []byte)
 	AccountPin, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_PIN)
 	if err != nil {
 		logg.ErrorCtxf(ctx, "failed to read AccountPin entry with", "key", storedb.DATA_ACCOUNT_PIN, "error", err)
-		return res, err
+		logg.InfoCtxf(ctx, "Setting the flag_account_pin_reset flag for the user to set their own PIN")
+		res.FlagSet = append(res.FlagSet, flag_account_pin_reset)
+		return res, nil
 	}
 
 	// verify that the user provided the correct PIN
diff --git a/services/registration/check_statement.vis b/services/registration/check_statement.vis
index c393a0a..0dc954d 100644
--- a/services/registration/check_statement.vis
+++ b/services/registration/check_statement.vis
@@ -7,6 +7,7 @@ MOUT back 0
 MOUT quit 9
 HALT
 RELOAD authorize_account
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP quit 9
diff --git a/services/registration/get_mpesa_confirmation.vis b/services/registration/get_mpesa_confirmation.vis
index eccee90..6a4ce39 100644
--- a/services/registration/get_mpesa_confirmation.vis
+++ b/services/registration/get_mpesa_confirmation.vis
@@ -7,6 +7,7 @@ MOUT quit 9
 HALT
 LOAD authorize_account 6
 RELOAD authorize_account
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP quit 9
diff --git a/services/registration/send_mpesa_confirmation.vis b/services/registration/send_mpesa_confirmation.vis
index 02dad12..75c26b8 100644
--- a/services/registration/send_mpesa_confirmation.vis
+++ b/services/registration/send_mpesa_confirmation.vis
@@ -6,6 +6,7 @@ MOUT quit 9
 HALT
 LOAD authorize_account 6
 RELOAD authorize_account
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP quit 9
diff --git a/services/registration/swap_preview.vis b/services/registration/swap_preview.vis
index 7e5276a..a6e2fef 100644
--- a/services/registration/swap_preview.vis
+++ b/services/registration/swap_preview.vis
@@ -6,6 +6,7 @@ MOUT quit 9
 LOAD authorize_account 6
 HALT
 RELOAD authorize_account
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP quit 9
diff --git a/services/registration/transaction_pin.vis b/services/registration/transaction_pin.vis
index 0388f0c..63719c7 100644
--- a/services/registration/transaction_pin.vis
+++ b/services/registration/transaction_pin.vis
@@ -9,6 +9,7 @@ MOUT quit 9
 LOAD authorize_account 6
 HALT
 RELOAD authorize_account
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP quit 9
diff --git a/services/registration/transaction_swap.vis b/services/registration/transaction_swap.vis
index 25e802c..6246a86 100644
--- a/services/registration/transaction_swap.vis
+++ b/services/registration/transaction_swap.vis
@@ -7,6 +7,7 @@ MOUT quit 9
 LOAD authorize_account 6
 HALT
 RELOAD authorize_account
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP quit 9
diff --git a/services/registration/view_pool.vis b/services/registration/view_pool.vis
index f506590..2952737 100644
--- a/services/registration/view_pool.vis
+++ b/services/registration/view_pool.vis
@@ -4,6 +4,7 @@ MOUT quit 9
 LOAD authorize_account 6
 HALT
 RELOAD authorize_account
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP quit 9
diff --git a/services/registration/view_voucher.vis b/services/registration/view_voucher.vis
index 1480099..6314eca 100644
--- a/services/registration/view_voucher.vis
+++ b/services/registration/view_voucher.vis
@@ -4,6 +4,7 @@ MOUT quit 9
 LOAD authorize_account 6
 HALT
 RELOAD authorize_account
+CATCH self_reset_pin flag_account_pin_reset 1
 CATCH incorrect_pin flag_incorrect_pin 1
 INCMP _ 0
 INCMP quit 9