diff --git a/symposion/teams/templatetags/teams_tags.py b/symposion/teams/templatetags/teams_tags.py
index 62005a3cfb0dd112d1d7d00be821355075a00b79..a50ca93a0c10148117250217e1bceb3678ce2cc5 100644
--- a/symposion/teams/templatetags/teams_tags.py
+++ b/symposion/teams/templatetags/teams_tags.py
@@ -23,15 +23,10 @@ class AvailableTeamsNode(template.Node):
         teams = []
         for team in Team.objects.all():
             state = team.get_state_for_user(request.user)
-            if team.access == "open":
-                if state in [None, "invited"]:
-                    teams.append(team)
-            elif team.access == "application":
-                if state in [None, "invited", "applied"]:
-                    teams.append(team)
-            elif team.access == "invitation":
-                if state == "invited":
-                    teams.append(team)
+            if state == "invited":
+                teams.append(team)
+            elif team.access == "open" and state is None:
+                teams.append(team)
         context[self.context_var] = teams
         return u""