handlers/application/menuhandler.go

@@ -318,7 +318,7 @@ func (h *MenuHandlers) VerifyNewPin(ctx context.Context, sym string, input []byt
 		return res, fmt.Errorf("missing session")
 	}
 	flag_valid_pin, _ := h.flagManager.GetFlag("flag_valid_pin")
-	if string(input) != "0" {
+	if !h.st.Back() {
 		pinInput := string(input)
 		// Validate that the PIN is a 4-digit number.
 		if pin.IsValidPIN(pinInput) {
@@ -456,7 +456,7 @@ func (h *MenuHandlers) ConfirmPinChange(ctx context.Context, sym string, input [
 	}
 	flag_pin_mismatch, _ := h.flagManager.GetFlag("flag_pin_mismatch")
 
-	if string(input) == "0" {
+	if h.st.Back() {
 		res.FlagReset = append(res.FlagReset, flag_pin_mismatch)
 		return res, nil
 	}

services/registration/old_pin.vis

@@ -4,5 +4,4 @@ HALT
 INCMP _ 0
 RELOAD authorize_account
 CATCH incorrect_pin flag_incorrect_pin 1
-CATCH _ flag_account_authorized 0
 INCMP new_pin *

services/registration/pin_reset_mismatch.vis

@@ -3,4 +3,4 @@ MOUT quit 9
 HALT
 INCMP _ 1
 INCMP quit 9
-INCMP . *
+

services/registration/pin_reset_success.vis

@@ -3,4 +3,3 @@ MOUT quit 9
 HALT
 INCMP main 0
 INCMP quit 9
-INCMP . *