Add option which makes the management of the user optional
Merge branch 'master' into add_manage_user