Some updates on user

@brentjo some updates to user