Removed username check