You should set it to public and not telling the users to do anything user profiles-wise until they login. What you did above, as you have realized, makes it 2 rows instead of one for a user.
At the point where the user first logs in, follow one of the onboarding flow tutorials in this forum. I would suggest this to be a good place to start.