Refactor user

And fix your other PR