Changing username check to not be focused specifically on ORM