diff --git a/gittip/models/participant.py b/gittip/models/participant.py
index 6d524b2731..5f63c7bf97 100644
--- a/gittip/models/participant.py
+++ b/gittip/models/participant.py
@@ -110,6 +110,10 @@ def tips_receiving(self):
         return self._tips_receiving.distinct("tips.tipper")\
                                    .order_by("tips.tipper, tips.mtime DESC")
 
+    @property
+    def accepts_tips(self):
+        return (self.goal is None) or (self.goal >= 0)
+
     @property
     def valid_tips_receiving(self):
         '''
diff --git a/templates/participant.html b/templates/participant.html
index 1f18a9fe2a..ae2e981079 100644
--- a/templates/participant.html
+++ b/templates/participant.html
@@ -55,7 +55,7 @@ <h2>{{ participant.username }}
     </tr>
 </table>
 
-{% if participant != user and participant.goal >= 0 %}
+{% if (participant != user) and participant.accepts_tips %}
 <div class="nav level-1">
     {% if locked %}