HEPCAT-97: Username verification issues