diff --git a/main/lib/idds/rest/v1/app.py b/main/lib/idds/rest/v1/app.py
index 913bd213..1329a74f 100644
--- a/main/lib/idds/rest/v1/app.py
+++ b/main/lib/idds/rest/v1/app.py
@@ -92,8 +92,10 @@ def before_request_auth():
     if auth_type in ['x509_proxy']:
         dn = flask.request.environ.get('SSL_CLIENT_S_DN', None)
         client_cert = flask.request.environ.get('SSL_CLIENT_CERT', None)
-        dn = dn.strip()
-        client_cert = client_cert.strip()
+        if dn:
+            dn = dn.strip()
+        if client_cert:
+            client_cert = client_cert.strip()
         if not dn or len(dn) == 0:
             dn = flask.request.headers.get('SSL-CLIENT-S-DN', default=None)
         if not client_cert or len(client_cert) == 0:
diff --git a/main/lib/idds/tests/test_domapanda.py b/main/lib/idds/tests/test_domapanda.py
index bc3c778e..468fe02d 100644
--- a/main/lib/idds/tests/test_domapanda.py
+++ b/main/lib/idds/tests/test_domapanda.py
@@ -177,5 +177,6 @@ def setup_workflow():
     workflow = setup_workflow()
 
     wm = ClientManager(host=host)
+    # wm.set_original_user(user_name="wguandev")
     request_id = wm.submit(workflow, use_dataset_name=False)
     print(request_id)
diff --git a/monitor/data/conf.js b/monitor/data/conf.js
index b51b5d45..78fee6d3 100644
--- a/monitor/data/conf.js
+++ b/monitor/data/conf.js
@@ -1,9 +1,9 @@
 
 var appConfig = {
-    'iddsAPI_request': "https://lxplus787.cern.ch:443/idds/monitor_request/null/null",
-    'iddsAPI_transform': "https://lxplus787.cern.ch:443/idds/monitor_transform/null/null",
-    'iddsAPI_processing': "https://lxplus787.cern.ch:443/idds/monitor_processing/null/null",
-    'iddsAPI_request_detail': "https://lxplus787.cern.ch:443/idds/monitor/null/null/true/false/false",
-    'iddsAPI_transform_detail': "https://lxplus787.cern.ch:443/idds/monitor/null/null/false/true/false",
-    'iddsAPI_processing_detail': "https://lxplus787.cern.ch:443/idds/monitor/null/null/false/false/true"
+    'iddsAPI_request': "https://lxplus8s18.cern.ch:443/idds/monitor_request/null/null",
+    'iddsAPI_transform': "https://lxplus8s18.cern.ch:443/idds/monitor_transform/null/null",
+    'iddsAPI_processing': "https://lxplus8s18.cern.ch:443/idds/monitor_processing/null/null",
+    'iddsAPI_request_detail': "https://lxplus8s18.cern.ch:443/idds/monitor/null/null/true/false/false",
+    'iddsAPI_transform_detail': "https://lxplus8s18.cern.ch:443/idds/monitor/null/null/false/true/false",
+    'iddsAPI_processing_detail': "https://lxplus8s18.cern.ch:443/idds/monitor/null/null/false/false/true"
 }