improved wording and fixed username flow