diff --git a/app/controllers/publishers_controller.rb b/app/controllers/publishers_controller.rb
index 8c3d16c62c..54456f9b57 100644
--- a/app/controllers/publishers_controller.rb
+++ b/app/controllers/publishers_controller.rb
@@ -266,6 +266,8 @@ def get_site_banner_data
   private
 
   def authenticate_via_token
+    sign_out(current_publisher) if current_publisher
+
     publisher_id = params[:id]
     token = params[:token]
     confirm_email = params[:confirm_email]
diff --git a/app/views/layouts/static.html.slim b/app/views/layouts/static.html.slim
index f832924b9c..6e2e3e5b55 100644
--- a/app/views/layouts/static.html.slim
+++ b/app/views/layouts/static.html.slim
@@ -19,4 +19,10 @@ html
     link rel="icon" type="image/png" href=image_path("favicon.ico")
 
   body data-action=params[:action] data-controller=params[:controller]
+    .notifications.navbar-static-top
+      - if flash[:alert]
+        .alert.alert-warning.flash= flash[:alert]
+      - if flash[:notice]
+        .alert.alert-success.flash= flash[:notice]
+
     = yield