handle username consistently