diff --git a/webapp/web/css/vitro.css b/webapp/web/css/vitro.css
index 7a2f951d5..141b88a79 100644
--- a/webapp/web/css/vitro.css
+++ b/webapp/web/css/vitro.css
@@ -63,7 +63,7 @@
     padding: .5em;  
     margin-bottom: 10px;
 }
-.rebuildSearchIndex {
+.contentNote {
     float: right;
     padding: .6em;
     background: #ffc;
@@ -71,12 +71,12 @@
     -webkit-border-radius: 6px;
     border-radius: 6px;
 }
-.rebuildSearchIndex h4,
-.rebuildSearchIndex p {
+.contentNote h4,
+.contentNote p {
     margin: 0;
     padding: 0;
 }
-.rebuildSearchIndex p {
+.contentNote p {
     font-size: .8em;
 }
 
diff --git a/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl b/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
index e397cb9d5..19c32a771 100644
--- a/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
+++ b/webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
@@ -14,16 +14,23 @@
     <#assign noData = false />
 </#if>
 
-<#assign noDataNotification>
-    <span class="rebuildSearchIndex"><h4>Expecting content?</h4> <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p></span>
+<#assign noDataNotification>    
+    <#if user.loggedIn>
+        <#if user.authorizedToRebuildSearchIndex>
+            <span class="contentNote">
+                <h4>Expecting content?</h4>
+                <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
+            </span>
+        </#if>
+    <#else>
+        <span class="contentNote">
+            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+        </span>
+    </#if>
     
     <h3>There is currently no content in the system</h3>
     
-    <#if user.loggedIn>
-        <#if user.hasSiteAdminAccess>
-            <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
-        </#if>
-    <#else>
-        <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+    <#if user.loggedIn && user.hasSiteAdminAccess>
+        <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
     </#if>
 </#assign>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
index 337f4f436..6661a019e 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
@@ -18,15 +18,22 @@
 </#if>
 
 <#assign noDataNotification>
-    <span class="rebuildSearchIndex"><h4>Expecting content?</h4> <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p></span>
-    
-    <h3>There is currently no ${page.title} content in the system</h3>
     <#if user.loggedIn>
-        <#if user.hasSiteAdminAccess>
-            <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
+        <#if user.authorizedToRebuildSearchIndex>
+            <span class="contentNote">
+                <h4>Expecting content?</h4>
+                <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
+            </span>
         </#if>
     <#else>
-        <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+        <span class="contentNote">
+            <p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
+        </span>
+    </#if>
+    
+    <h3>There is currently no ${page.title} content in the system</h3>
+    <#if user.loggedIn && user.hasSiteAdminAccess>
+        <p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
     </#if>
     
     <p>You can browse all of the public content currently in the system using the <a href="${urls.index}" title="browse all content">index page</a>.</p>