[fix bug 920811] Add external accounts to global privacy control.

Also simplify the privacy field macro.