Fixing broken username checks. This version works!