Update: user and rights management

Follow