More reworking of username check