Smarter username markup

Fixes #402