diff --git a/templates/partials/bag_list.html b/templates/partials/bag_list.html
index 58900d7..06f89de 100644
--- a/templates/partials/bag_list.html
+++ b/templates/partials/bag_list.html
@@ -7,7 +7,11 @@
     class="rounded-lg border border-dashed border-amber-300 bg-amber-100/40 px-4 py-6 text-sm text-stone-600"
   >
     <p class="text-center">
-      No bags recorded yet. Use the form above to add your first bag.
+      {% if is_authenticated %}
+      No bags added yet. Click the Add button to create your first bag.
+      {% else %}
+      No bags added yet.
+      {% endif %}
     </p>
   </div>
   {% else %}
diff --git a/templates/partials/brew_list.html b/templates/partials/brew_list.html
index ca7591d..d72b63e 100644
--- a/templates/partials/brew_list.html
+++ b/templates/partials/brew_list.html
@@ -7,7 +7,11 @@
     class="rounded-lg border border-dashed border-amber-300 bg-amber-100/40 px-4 py-6 text-sm text-stone-600"
   >
     <p class="text-center">
-      No brews logged yet. Use the form above to log your first brew.
+      {% if is_authenticated %}
+      No brews logged yet. Click the Add button to log your first brew.
+      {% else %}
+      No brews logged yet.
+      {% endif %}
     </p>
   </div>
   {% else %}
diff --git a/templates/partials/cafe_list.html b/templates/partials/cafe_list.html
index ab1f941..c0487e9 100644
--- a/templates/partials/cafe_list.html
+++ b/templates/partials/cafe_list.html
@@ -7,7 +7,11 @@
     class="rounded-lg border border-dashed border-amber-300 bg-amber-100/40 px-4 py-6 text-sm text-stone-600"
   >
     <p class="text-center">
-      No cafes recorded yet. Use the form above to add your first cafe.
+      {% if is_authenticated %}
+      No cafes added yet. Click the Add button to add your first cafe.
+      {% else %}
+      No cafes added yet.
+      {% endif %}
     </p>
   </div>
   {% else %}
diff --git a/templates/partials/cup_list.html b/templates/partials/cup_list.html
index 953491d..d004618 100644
--- a/templates/partials/cup_list.html
+++ b/templates/partials/cup_list.html
@@ -7,7 +7,11 @@
     class="rounded-lg border border-dashed border-amber-300 bg-amber-100/40 px-4 py-6 text-sm text-stone-600"
   >
     <p class="text-center">
-      No cups recorded yet. Use the form above to add your first cup.
+      {% if is_authenticated %}
+      No cups added yet. Click the Add button to add your first cup.
+      {% else %}
+      No cups added yet.
+      {% endif %}
     </p>
   </div>
   {% else %}
diff --git a/templates/partials/gear_list.html b/templates/partials/gear_list.html
index d633032..1d7a88d 100644
--- a/templates/partials/gear_list.html
+++ b/templates/partials/gear_list.html
@@ -7,7 +7,11 @@
     class="rounded-lg border border-dashed border-amber-300 bg-amber-100/40 px-4 py-6 text-sm text-stone-600"
   >
     <p class="text-center">
-      No gear found. Use the form above to add your first piece of brewing equipment.
+      {% if is_authenticated %}
+      No gear added yet. Click the Add button to add your first piece of equipment.
+      {% else %}
+      No gear added yet.
+      {% endif %}
     </p>
   </div>
   {% else %}
diff --git a/templates/partials/roast_list.html b/templates/partials/roast_list.html
index 1f9e9fe..f69cd5c 100644
--- a/templates/partials/roast_list.html
+++ b/templates/partials/roast_list.html
@@ -6,7 +6,13 @@
   <div
     class="rounded-lg border border-dashed border-amber-300 bg-amber-100/40 px-4 py-6 text-sm text-stone-600"
   >
-    <p class="text-center">No roasts recorded yet. Use the form above to add your first roast.</p>
+    <p class="text-center">
+      {% if is_authenticated %}
+      No roasts added yet. Click the Add button to create your first roast.
+      {% else %}
+      No roasts added yet.
+      {% endif %}
+    </p>
   </div>
   {% else %}
   <section class="rounded-lg border border-amber-300 bg-amber-100/80 shadow-sm"
diff --git a/templates/partials/roaster_list.html b/templates/partials/roaster_list.html
index 068d495..01ca349 100644
--- a/templates/partials/roaster_list.html
+++ b/templates/partials/roaster_list.html
@@ -7,7 +7,11 @@
     class="rounded-lg border border-dashed border-amber-300 bg-amber-100/40 px-4 py-6 text-sm text-stone-600"
   >
     <p class="text-center">
-      No roasters recorded yet. Use the form above to add your first roaster.
+      {% if is_authenticated %}
+      No roasters added yet. Click the Add button to create your first roaster.
+      {% else %}
+      No roasters added yet.
+      {% endif %}
     </p>
   </div>
   {% else %}