Improve multi user support

Change-Id: I94b8dda7edc2de3857cce0fe381520c0ba1a2a76
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>