tweaks to get perms to work for org and new zone
had nothing to do with perms, actually.
Merge pull request #582 from bcipolli/org_and_zone_fix

Tweaks to get perms to work for org and new zone