I am surprised to see this logic to save a user
more changes