Simplify email procedure now that subscribers are on the newsletter list.
Account for the EE only situation.
Move signup_enabled and signin_enabled back

This partially reverts b5543be19dc4e6c546e5f by restoring the nesting
for the signup_enabled and signin_enabled attributes.
Merge branch 'patch-email' into 'master'

Patch email

See merge request !981
Merge branch 'fix_signup_config' into 'master'

Fix signup config

See merge request !983