Add username to edit fields.
Tweak firewall so sign in page has access to the current user token.