Add user management

Remove reference to step (?)