Adding username.
Checkpoint
Merge martin's username fix. Fixes #16