mako: Enable multi-user support

Change-Id: Ie12718633ed1425798ffa4a7d91d409740cf0698