Add initial username check