improved wording and fixed username flow
Merge pull request #32 from conorfennell/wording

improved wording and fixed username flow