More username fixes

yowainwright