Updated to latest user-manager