Fix up username check