     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 '1':
                        Modem_flowControl = true;
                        break;
                    }
                    break;


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

                case '\n':
                case '\r':
                break;

                default:
                errors++;
            }
        }
    
