nit: improve user handling
2 files changed