Use original uid

Refs #1561
Refs #1563
Merge branch 'master' of github.com:M66B/XPrivacy