Merge pull request #95 from vexxhost/nit-improve-user-handle

nit: improve user handling