Enable support for multiple users

Change-Id: I54a2794100f79e64ca9eefc94f89229060242f96