fix username handling