Fix saveAccount