Fixing username bug