Adding email button visible, even if no self-service permissions set

Users get a confusing Add button for email addresses even if no self-service permissions are set to allow any type of email address to be added. This results in users being able to enter email address information, but unable to specify the address type and hence unable to save the form.