Add confirmation to email subscription
Fix to merge