fixed some issues with multiple user email, also fixed issue with edit zone page.