Added username check