diff --git a/snipts/api.py b/snipts/api.py
index 468e195..2b522dd 100644
--- a/snipts/api.py
+++ b/snipts/api.py
@@ -176,7 +176,7 @@ class PublicUserResource(ModelResource):
         fields = ['id', 'username']
         include_absolute_url = True
         allowed_methods = ['get']
-        filtering = {'username': 'exact'}
+        filtering = {'username': ['contains', 'exact']}
         max_limit = 200
         cache = SimpleCache()
 
diff --git a/teams/views.py b/teams/views.py
index 12fa0b2..24a0ac3 100644
--- a/teams/views.py
+++ b/teams/views.py
@@ -22,6 +22,8 @@ def for_teams(request):
 @render_to('teams/team-billing.html')
 def team_billing(request, username):
     team = get_object_or_404(Team, slug=username)
+    if team.owner != request.user:
+        raise Http404
     return {
         'team': team
     }
@@ -30,8 +32,6 @@ def team_billing(request, username):
 @render_to('teams/team-members.html')
 def team_members(request, username):
     team = get_object_or_404(Team, slug=username)
-    if team.owner != request.user:
-        raise Http404
     return {
         'team': team
     }