diff --git a/maps/templates/maps/account_settings.html b/maps/templates/maps/account_settings.html
index 647b7ab..a64beb7 100644
--- a/maps/templates/maps/account_settings.html
+++ b/maps/templates/maps/account_settings.html
@@ -8,6 +8,7 @@
         <p><a class="link--breadcrumb" href="{% url 'index' %}">{% trans "Home" %}</a></p>
         <h1>{% trans 'Account settings' %}</h1>
     </div>
+    {% include 'maps/partials/messages.html' %}
     <div class="stack">
         <ul class="link-list">
             <li class="link-list__item"><a href="{% url 'account_email' %}">{% trans 'Manage email addresses' %}</a></li>
diff --git a/maps/templates/maps/index.html b/maps/templates/maps/index.html
index ebffbe3..00e097d 100644
--- a/maps/templates/maps/index.html
+++ b/maps/templates/maps/index.html
@@ -8,6 +8,7 @@
           <h1><span class="pc-ff--sans pc-fw--normal">Platform Co-op</span><br/> Directory</h1>
           <p class="subhead">The Platform Co-op Directory is a place where you can search for and connect with co-operatives and other members of the co-operative community.</p>
         </div>
+        {% include 'maps/partials/messages.html' %}
         {% include 'maps/search--home.html' %}
         <div id="main-map"></div>
         {% include 'maps/filters.html' %}
diff --git a/maps/templates/maps/individual_detail.html b/maps/templates/maps/individual_detail.html
index f4577fe..5628c0f 100644
--- a/maps/templates/maps/individual_detail.html
+++ b/maps/templates/maps/individual_detail.html
@@ -32,7 +32,7 @@ <h1>{{ individual.first_name }} {{ individual.last_name }}</h1>
         </p>
         {% endif %}
     </div>
-
+    {% include 'maps/partials/messages.html' %}
     <div class="tabs">
         <div role="tablist" aria-labelledby="tabs-label">
             <span class="screen-reader-text" id="tabs-label">{% trans 'tab group' %}</span>
diff --git a/maps/templates/maps/my_profiles.html b/maps/templates/maps/my_profiles.html
index 227cc16..ae55312 100644
--- a/maps/templates/maps/my_profiles.html
+++ b/maps/templates/maps/my_profiles.html
@@ -8,11 +8,7 @@
         <p><a class="link--breadcrumb" href="/">{% trans 'Home' %}</a></p>
         <h1>{% trans 'My profiles' %}</h1>
     </div>
-    {% if messages %}
-        {% for message in messages %}
-        {% include 'maps/partials/notification.html' %}
-        {% endfor %}
-    {% endif %}
+    {% include 'maps/partials/messages.html' %}
     <h2>{% trans 'Personal profile' %}</h2>
     {% if user.has_profile %}
     <ul class="cards">
diff --git a/maps/templates/maps/organization_detail.html b/maps/templates/maps/organization_detail.html
index 0cdd2dd..dcc23c0 100644
--- a/maps/templates/maps/organization_detail.html
+++ b/maps/templates/maps/organization_detail.html
@@ -5,7 +5,6 @@
 {% block bodyclass %}profile profile--organization{% endblock %}
 {% block content %}
   <div class="page-header">
-      
       <p>
         {% if organization.type.icon %}{% icon organization.type.icon %}{% endif %}
         {{ organization.type }}
@@ -35,6 +34,7 @@ <h1>{{ organization.name }}</h1>
       </p>
       {% endif %}
   </div>
+  {% include 'maps/partials/messages.html' %}
   <div class="tabs">
   <div role="tablist" aria-labelledby="tabs-label">
     <span class="screen-reader-text" id="tabs-label">{% trans 'tab group' %}</span>
diff --git a/maps/templates/maps/partials/messages.html b/maps/templates/maps/partials/messages.html
new file mode 100644
index 0000000..9ea3656
--- /dev/null
+++ b/maps/templates/maps/partials/messages.html
@@ -0,0 +1,5 @@
+{% if messages %}
+    {% for message in messages %}
+    {% include 'maps/partials/notification.html' %}
+    {% endfor %}
+{% endif %}