diff --git a/esap/accounts/api/views.py b/esap/accounts/api/views.py
index e832aa79708b00f6a0f41936994ad1ba9661cd23..cb96ebafb98f3b1a08956f7af4b1a835c8d914b4 100644
--- a/esap/accounts/api/views.py
+++ b/esap/accounts/api/views.py
@@ -3,6 +3,8 @@ from rest_framework import permissions
 from .serializers import *
 from ..models import *
 
+from django.contrib import auth
+
 
 class EsapQuerySchemaViewSet(viewsets.ModelViewSet):
     """
@@ -53,7 +55,11 @@ class EsapUserProfileViewSet(viewsets.ModelViewSet):
     serializer_class = EsapUserProfileSerializer
     permission_classes = [permissions.AllowAny]
 
-    # def get_queryset(self):
-    #     # Returns nothing if no user_name supplied instead of all
-    #     user_name = self.request.query_params.get("user_name", None)
-    #     return EsapUserProfile.objects.filter(user_name=user_name)
+    def get_queryset(self):
+        # Returns nothing if no user_name supplied instead of all
+        user = auth.get_user(self.request)
+        if user is None:
+            user_name = self.request.query_params.get("user_name", None)
+            return EsapUserProfile.objects.filter(user_name=user_name)
+        user_email = user.email
+        return EsapUserProfile.objects.filter(user_email=user_email)
diff --git a/esap/esap/configuration/esap_rucio.py b/esap/esap/configuration/esap_rucio.py
index 4b8c9b23601e5e0d4534a7c3eae0782de4e9453e..0490d3e09f33bb2eb5337f59be353ecc10a65841 100644
--- a/esap/esap/configuration/esap_rucio.py
+++ b/esap/esap/configuration/esap_rucio.py
@@ -7,7 +7,8 @@ rucio_url = "https://escape-rucio.cern.ch"
 AUTH_PORT = 32301
 STANDARD_PORT = 32300
 
-RUCIO_AUTH_TOKEN = "grange-/DC=org/DC=terena/DC=tcs/C=NL/O=ASTRON/CN=Robot - Yan Grange 1086@astron.nl-unknown-809a62ca07bb471cac3012b6af752c86"
+RUCIO_AUTH_TOKEN = "<REDACTED>"
+
 
 def validate():
     url = os.path.join(f"{rucio_url}:{AUTH_PORT}", "auth", "validate")
@@ -74,8 +75,8 @@ query_schema = {
         "resource_category": {
             "type": "string",
             "title": "Category",
-            "enum": ["files", "dids"],
-            "enumNames": ["Files", "DIDs"],
+            "enum": ["files", "dids", "replicas"],
+            "enumNames": ["Files", "DIDs", "Replicas"],
             "default": "dids",
         },
         "catalog": {
diff --git a/esap/query/api/services/rucio.py b/esap/query/api/services/rucio.py
index af12f3ac32d2c803aa134975412e38a7962aefcf..d7e03432b7b1faeb86421177acd91a8648f529e6 100644
--- a/esap/query/api/services/rucio.py
+++ b/esap/query/api/services/rucio.py
@@ -18,12 +18,13 @@ AMP_REPLACEMENT = "_and_"
 # The request header
 RUCIO_HOST = "https://escape-rucio.cern.ch:32300"
 RUCIO_PORT = 32300
-RUCIO_AUTH_TOKEN = "grange-/DC=org/DC=terena/DC=tcs/C=NL/O=ASTRON/CN=Robot - Yan Grange 1086@astron.nl-unknown-809a62ca07bb471cac3012b6af752c86"
+RUCIO_AUTH_TOKEN = "<REDACTED>"
 
 URLPATTERNS = dict(
     scope="{host}/scopes/",
     dids="{host}/dids/{scope}/",
     files="{host}/dids/{scope}/files/",
+    replicas="{host}/replicas/{scope}/"
 )
 
 # --------------------------------------------------------------------------------------------------------------------