Added SammyIAm fix for username truncation