2nd take on fixing username floating issue.

Fix for issue #263 

Followup for issue #418