multiuser: cleanup (accepted upstream)

Change-Id: Ie8d7ae3006f2cd5b838ada869047aad81914f242
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>