diff --git a/members/tests.py b/members/tests.py
index c32407b..7105332 100644
--- a/members/tests.py
+++ b/members/tests.py
@@ -64,7 +64,6 @@ class MemberRegisterTestCase(TestCase):
 
         self.assertEqual(response.status_code, 200)
 
-    @skip("TODO: Fix")
     def test_autocomplete_search_found(self):
         """Test member autocomplete search"""
         search_terms = 'Tidus'
@@ -72,7 +71,6 @@ class MemberRegisterTestCase(TestCase):
         results = response.json()['results']
         self.assertEqual(len(results), 1)
 
-    @skip("TODO: Fix")
     def test_autocomplete_search_not_found(self):
         """Test member autocomplete search"""
         search_terms = 'Notfound'
diff --git a/members/urls.py b/members/urls.py
index 7bdba7d..80e0466 100644
--- a/members/urls.py
+++ b/members/urls.py
@@ -45,10 +45,6 @@ from members.views import application_submit
 favicon_view = RedirectView.as_view(
     url='static/img/favicon.ico', permanent=True)
 
-member_autocomplete_view = login_required(
-    permission_required('members.change_member', login_url='/admin/login')
-)
-
 urlpatterns = [
 
     # landing page
@@ -126,7 +122,7 @@ urlpatterns = [
     # member select autocomplete view
     url(
         r'^member-autocomplete/$',
-        member_autocomplete_view,
+        MemberAutoComplete.as_view(),
         name='member-autocomplete',
     ),
 
diff --git a/members/views/members.py b/members/views/members.py
index a27e7fe..5a0db48 100644
--- a/members/views/members.py
+++ b/members/views/members.py
@@ -217,6 +217,8 @@ def member_edit(request, *args, **kwargs):
             request, 'member_edit.html', {'member_id': i, 'form': form})
 
 
+@method_decorator(login_required(login_url='/admin/login'), name='dispatch')
+@method_decorator(permission_required('members.change_member'), name='dispatch')
 class MemberAutoComplete(autocomplete.Select2QuerySetView):
 
     def get_queryset(self):