Fixed issue with usernames being changed: CREDIT: Shade