diff --git a/synapse/rest/client/v2_alpha/thirdparty.py b/synapse/rest/client/v2_alpha/thirdparty.py
index 0180b73e9f..4b2a93f1bb 100644
--- a/synapse/rest/client/v2_alpha/thirdparty.py
+++ b/synapse/rest/client/v2_alpha/thirdparty.py
@@ -35,7 +35,11 @@ class ThirdPartyUserServlet(RestServlet):
 
     @defer.inlineCallbacks
     def on_GET(self, request, protocol):
-        fields = {} # TODO
+        fields = request.args
+        del fields["access_token"]
+
+        # TODO(paul): Some type checking on the request args might be nice
+        #   They should probably all be strings
         results = yield self.appservice_handler.query_3pu(protocol, fields)
 
         defer.returnValue((200, results))