Expand username paths

Suggestion from Muhammad