2nd take on fixing username floating issues
Merge pull request #451 from bslayton/#263-username-floating

2nd take on fixing username floating issue.