Correct how user's name is determined