Fixing the username var issue