Fix-up for Ied71b5032: restore user ID check

Change-Id: If9cdde0f093aaac2edc167767196f9c7ed797d9b
Merge "Fix-up for Ied71b5032: restore user ID check"