diff --git a/addons/portal/controllers/portal.py b/addons/portal/controllers/portal.py
index dd31f68e770..40987c58047 100644
--- a/addons/portal/controllers/portal.py
+++ b/addons/portal/controllers/portal.py
@@ -179,6 +179,7 @@ class CustomerPortal(Controller):
                     except:
                         values[field] = False
                 values.update({'zip': values.pop('zipcode', '')})
+                self.on_account_update(values, partner)
                 partner.sudo().write(values)
                 if redirect:
                     return request.redirect(redirect)
@@ -200,6 +201,9 @@ class CustomerPortal(Controller):
         response.headers['X-Frame-Options'] = 'DENY'
         return response
 
+    def on_account_update(self, values, partner):
+        pass
+
     @route('/my/security', type='http', auth='user', website=True, methods=['GET', 'POST'])
     def security(self, **post):
         values = self._prepare_portal_layout_values()
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 1419ff17ee7..98dafb19842 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -51,7 +51,7 @@
                 <div class="col o_wprofile_email_validation_container mb16">
                     <t t-call="website_profile.email_validation_banner">
                         <t t-set="redirect_url" t-value="'/forum/%s' % forum.id"/>
-                        <t t-set="send_validation_email_message">Click here to send a verification email allowing you to participate in the forum.</t>
+                        <t t-set="additional_validation_email_message"> and join this Forum</t>
                         <t t-set="additional_validated_email_message"> You may now participate in our forums.</t>
                     </t>
                     <div class="row">
diff --git a/addons/website_profile/controllers/__init__.py b/addons/website_profile/controllers/__init__.py
index 5d4b25db9c0..d8f273d4230 100644
--- a/addons/website_profile/controllers/__init__.py
+++ b/addons/website_profile/controllers/__init__.py
@@ -2,3 +2,4 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from . import main
+from . import portal
diff --git a/addons/website_profile/controllers/portal.py b/addons/website_profile/controllers/portal.py
new file mode 100644
index 00000000000..748b0e53a1f
--- /dev/null
+++ b/addons/website_profile/controllers/portal.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.portal.controllers import portal
+from odoo.http import request
+
+
+class CustomerPortal(portal.CustomerPortal):
+
+    def on_account_update(self, values, partner):
+        super().on_account_update(values, partner)
+        # Do not show "Validation Email sent" if the current user changed their email address
+        if values["email"] != partner.email:
+            request.session['validation_email_sent'] = False
diff --git a/addons/website_profile/static/src/js/website_profile.js b/addons/website_profile/static/src/js/website_profile.js
index 1525eaa0fd8..aff7124dcca 100644
--- a/addons/website_profile/static/src/js/website_profile.js
+++ b/addons/website_profile/static/src/js/website_profile.js
@@ -27,7 +27,7 @@ publicWidget.registry.websiteProfile = publicWidget.Widget.extend({
             params: {'redirect_url': $element.data('redirect_url')},
         }).then(function (data) {
             if (data) {
-                self.$('button.validation_email_close').click();
+                window.location = $element.data('redirect_url');
             }
         });
     },
diff --git a/addons/website_profile/views/website_profile.xml b/addons/website_profile/views/website_profile.xml
index 6b96b3dc865..42de7cb90ac 100644
--- a/addons/website_profile/views/website_profile.xml
+++ b/addons/website_profile/views/website_profile.xml
@@ -283,7 +283,7 @@
                             <div class="o_wprofile_email_validation_container mb16 mt16">
                                 <t t-call="website_profile.email_validation_banner">
                                     <t t-set="redirect_url" t-value="'/profile/user/%s' % user.id"/>
-                                    <t t-set="send_validation_email_message">Click here to send a verification email.</t>
+                                    <t t-set="additional_validation_email_message"/>
                                 </t>
                             </div>
                             <div id="profile_about_badge" class="mb32">
@@ -627,13 +627,22 @@
     <template id="email_validation_banner">
         <t t-set="send_alert_classes" t-value="send_alert_classes if send_alert_classes else 'alert alert-danger alert-dismissable'"/>
         <t t-set="done_alert_classes" t-value="done_alert_classes if done_alert_classes else 'alert alert-success alert-dismissable'"/>
+        <t t-set="my_account_redirect" t-value="'/my/account?redirect='+redirect_url"/>
 
-        <div t-if="not validation_email_sent and not is_public_user and user.karma == 0" t-att-class="send_alert_classes" role="alert">
+        <div t-if="not is_public_user and not user.email" t-att-class="send_alert_classes" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">×</button>
+            Your account does not have an email set up. Please set it up on <a class="alert-link" t-att-href="my_account_redirect">your account settings</a>.
+        </div>
+        <div t-elif="not validation_email_sent and not is_public_user and user.karma == 0" t-att-class="send_alert_classes" role="alert">
             <button type="button" class="close validation_email_close" data-dismiss="alert" aria-label="Close">×</button>
-            It appears your email has not been verified.<br/>
-            <a class="send_validation_email alert-link" href="#" t-att-data-redirect_url="redirect_url">
-                <span t-esc="send_validation_email_message"/>
-            </a>
+            Your Account has not yet been verified.<br/>
+            Click <a class="send_validation_email alert-link" href="#" t-att-data-redirect_url="redirect_url"><u>here</u></a> to receive a verification email<t t-esc="additional_validation_email_message"/>!
+        </div>
+        <div t-elif="validation_email_sent and not validation_email_done" t-att-class="done_alert_classes">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">×</button>
+            Verification Email sent to <i t-esc="user.email"></i>!<br/>
+            Did not receive it? <a class="alert-link" t-att-href="my_account_redirect"><u>Correct your email address</u></a> 
+            or <a class="send_validation_email alert-link" href="#" t-att-data-redirect_url="redirect_url"><u>Send Again</u></a>.
         </div>
         <div t-if="validation_email_done" t-att-class="done_alert_classes" role="status">
             <button type="button" class="close validated_email_close" data-dismiss="alert" aria-label="Close">×</button>
diff --git a/addons/website_slides/views/website_slides_templates_homepage.xml b/addons/website_slides/views/website_slides_templates_homepage.xml
index b4f726ab813..8d8be1be06c 100644
--- a/addons/website_slides/views/website_slides_templates_homepage.xml
+++ b/addons/website_slides/views/website_slides_templates_homepage.xml
@@ -45,7 +45,7 @@
                         <t t-set="redirect_url" t-value="'/slides'"/>
                         <t t-set="send_alert_classes" t-value="'alert alert-danger alert-dismissable mt-4 mb-0'"/>
                         <t t-set="done_alert_classes" t-value="'alert alert-success alert-dismissable mt-4 mb-0'"/>
-                        <t t-set="send_validation_email_message">Click here to send a verification email allowing you to participate at the eLearning.</t>
+                        <t t-set="additional_validation_email_message"> and join this Community</t>
                         <t t-set="additional_validated_email_message"> You may now participate in our eLearning.</t>
                     </t>
                 </div>
@@ -251,7 +251,7 @@
                 <div class="o_wprofile_email_validation_container mb16 mt16">
                     <t t-call="website_profile.email_validation_banner">
                         <t t-set="redirect_url" t-value="'/slides'"/>
-                        <t t-set="send_validation_email_message">Click here to send a verification email allowing you to participate at the eLearning.</t>
+                        <t t-set="additional_validation_email_message"> and join this Community</t>
                         <t t-set="additional_validated_email_message"> You may now participate in our eLearning.</t>
                     </t>
                 </div>