     }
     else if (strcmp(Modem_CommandBuffer, ("AT&F")) == 0)
     {
-        if (strcmp(Modem_LastCommandBuffer, ("AT&F")) == 0)
-        {
             Modem_LoadDefaults();
             Modem_PrintOK();
         }
-        else
-        {
-            C64Println(F("Send command again to verify")); 
-        }
-    }
     else if (strcmp(Modem_CommandBuffer, ("ATA")) == 0)
     {
         Modem_Answer();    

//            break;

        default: // Invalid - on first startup or if corrupted.  Clear silently and continue to menu.
            EEPROM.write(ADDR_AUTOSTART, AUTO_NONE);
            autostart_mode = AUTO_NONE;
            return;
    }

        C64Println(F("1. Display Current Configuration"));
        C64Println(F("2. Change SSID"));
        C64Println(F("3. Autostart Options"));
        //C64Println(F("4. Change baud rate"));
        C64Println(F("4. Direct Terminal Mode (Debug)"));
        C64Println(F("5. Return to Main Menu"));
        C64Println();
        C64Print(F("Select: "));

