Fixing username reference