Put username in string to allow reordering

Undoes our own cardinal rules of using a snippet.  Allows a user to
place the username where it might make more sense.  Needs someone else
to test though.