fixed save/restore state when picking friend