4 changed files with 6 additions and 6 deletions
--- a/internal/handlers/ussd/menuhandler.go
+++ b/internal/handlers/ussd/menuhandler.go
@ -816,6 +816,7 @@ func (h *Handlers) ValidateBlockedNumber(ctx context.Context, sym string, input
 	var err error

 	flag_unregistered_number, _ := h.flagManager.GetFlag("flag_unregistered_number")
+
 	store := h.userdataStore
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
@ -824,7 +825,6 @@ func (h *Handlers) ValidateBlockedNumber(ctx context.Context, sym string, input
 	blockedNumber := string(input)
 	_, err = store.ReadEntry(ctx, blockedNumber, utils.DATA_PUBLIC_KEY)
 	if !isValidPhoneNumber(blockedNumber) {
-		res.FlagSet = append(res.FlagSet, flag_unregistered_number)
 		return res, nil
 	}
 	if err != nil {
--- a/services/registration/enter_other_number.vis
+++ b/services/registration/enter_other_number.vis
@ -4,4 +4,7 @@ RELOAD reset_account_authorized
 MOUT back 0
 HALT
 INCMP _ 0
+LOAD validate_blocked_number 20
+RELOAD validate_blocked_number
+CATCH unregistered_number flag_unregistered_number 1
 INCMP enter_others_new_pin *
--- a/services/registration/enter_others_new_pin.vis
+++ b/services/registration/enter_others_new_pin.vis
@ -1,6 +1,3 @@
-LOAD validate_blocked_number 20
-RELOAD validate_blocked_number
-CATCH unregistered_number flag_unregistered_number 1
 LOAD retrieve_blocked_number 0
 MAP retrieve_blocked_number
 MOUT back 0
--- a/services/registration/unregistered_number.vis
+++ b/services/registration/unregistered_number.vis
@ -1,7 +1,7 @@
 LOAD reset_unregistered_number 0
 RELOAD reset_unregistered_number
-MOUT back 1
+MOUT retry 1
 MOUT quit 9
 HALT
-INCMP ^ 1
+INCMP _ 1
 INCMP quit 9