Partially revert 5c84bfb7b9 - email address is required on Plone member