Fix the client not saved bug