Minor change to registration page to handle usernames not emails, also f...

...ixed form on welcome page