     Modem_EscapeCount = 0;
 
     Modem_LoadDefaults();
+
+    // Load saved settings
+    Modem_EchoOn = EEPROM.read(ADDR_MODEM_ECHO);
+    Modem_flowControl = EEPROM.read(ADDR_MODEM_FLOW);
+    
     Modem_ResetCommandBuffer();
 
     C64Println();

                    case 'W':
                    updateEEPROMByte(ADDR_MODEM_ECHO,Modem_EchoOn);
                    updateEEPROMByte(ADDR_MODEM_FLOW,Modem_flowControl);
                    if (wifly.save())
                        Modem_PrintOK();
                    else
                        Modem_PrintERROR();
                    break;
                }
                break;
            }
        }
    

// Misc Values
#define TIMEDOUT  -1
boolean baudMismatch = (BAUD_RATE != WiFly_BAUD_RATE ? 1 : 0);
boolean Modem_flowControl = false;   // for &K setting.

// PETSCII state
boolean petscii_mode = EEPROM.read(ADDR_PETSCII);
