diff --git a/src/joystick_utils.cpp b/src/joystick_utils.cpp
index dbef764..bb7ff53 100644
--- a/src/joystick_utils.cpp
+++ b/src/joystick_utils.cpp
@@ -26,8 +26,8 @@ typedef void (*DirectionFunc)();
         }
 
         bool checkMenuDisplayToExitInterrupt(int menu) {
-            if (menu == 10 || menu == 120 || menu == 200 || menu == 210 || menu == 51 || menu == 50100 || menu == 50111) {
-                return true;    // read / delete/ callsignIndex / loraIndex / readW / readW / delete
+            if (menu == 10 || menu == 120 || menu == 200 || menu == 210 || menu == 51 || menu == 50100 || menu == 50111 || menu == 9001) {
+                return true;    // read / delete/ callsignIndex / loraIndex / readW / readW / delete / enter WiFiAP
             } else {
                 return false;
             }
diff --git a/src/msg_utils.cpp b/src/msg_utils.cpp
index f7aa978..eb50666 100644
--- a/src/msg_utils.cpp
+++ b/src/msg_utils.cpp
@@ -29,6 +29,7 @@ extern int                  ackRequestNumber;
 extern uint32_t             lastTxTime;
 
 extern uint8_t              winlinkStatus;
+extern uint32_t             lastChallengeTime;
 
 extern bool                 wxRequestStatus;
 extern uint32_t             wxRequestTime;
@@ -516,6 +517,7 @@ namespace MSG_Utils {
                                 logger.log(logging::LoggerLevel::LOGGER_LEVEL_INFO, "Winlink","---> Log Out");
                                 lastMsgRxTime = millis();
                                 displayShow("_WINLINK_>", "", "    LOG OUT !!!", 2000);
+                                lastChallengeTime = 0;
                                 winlinkStatus = 0;
                             } else if ((winlinkStatus == 5) && (lastReceivedPacket.message.indexOf("Log off successful") == -1) && (lastReceivedPacket.message.indexOf("Login valid") == -1) && (lastReceivedPacket.message.indexOf("Login [") == -1) && (lastReceivedPacket.message.indexOf("ack") == -1)) {
                                 lastMsgRxTime = millis();