diff --git a/get_together/templates/get_together/users/show_profile.html b/get_together/templates/get_together/users/show_profile.html
index 0ccf8af..20d79e6 100644
--- a/get_together/templates/get_together/users/show_profile.html
+++ b/get_together/templates/get_together/users/show_profile.html
@@ -17,7 +17,7 @@ Homepage: {{user.weburl}} <br>
     <ul>
     {% for t in teams %}
 		<li>
-			<a href="{% url 'show-team' t.id %}" title="Team page for {{t.team.name}}">{{t.team.name}}</a>
+			<a href="{% url 'show-team' t.id %}" title="Team page for {{t.name}}">{{t.name}}</a>
 		</li>
     {% endfor %}
     </ul>
diff --git a/get_together/views/user.py b/get_together/views/user.py
index c7c9aad..1f0a47e 100644
--- a/get_together/views/user.py
+++ b/get_together/views/user.py
@@ -38,7 +38,7 @@ def show_profile(request, user_id):
     except ObjectDoesNotExist:
         return render(request, template, {'user': None}, status=404)
 
-    teams = Member.objects.filter(user_id=user_id)
+    teams = user.memberships.all()
 
     context = {
             'user': user,