Added a username check.