Fix-up for Ied71b5032: restore user ID check

Change-Id: If9cdde0f093aaac2edc167767196f9c7ed797d9b
(cherry picked from commit 0cab6b63fc0abab1a48cdd677f7ab3eb9696aed4)