diff --git a/jsc_custom/authenticator/oauthenticator.py b/jsc_custom/authenticator/oauthenticator.py
index 0f77d42b752dbe2c19b24de021e18293d179e7a4..b59c609e6593907d7e59631d82a6c07549b057fa 100644
--- a/jsc_custom/authenticator/oauthenticator.py
+++ b/jsc_custom/authenticator/oauthenticator.py
@@ -39,7 +39,7 @@ def get_system_infos(
     3. Remove systems in maintenance
     4. Create and return dicts of lists for system, account, project, partition, reservation
     """
-    s = "^([^\,]+),([^\,]+),([^\,]+),([^\,]+)"
+    s = "^([^\,]+),([^\,]+),([^\,]+),([^\,]+).*"
     c = re.compile(s)
 
     def regroup(x):
@@ -948,7 +948,7 @@ class CustomGenericOAuthenticator(GenericOAuthenticator):
             hpc_list = ["".join(hpc_list)]
         for entry in hpc_list:
             try:
-                partition = re.search("[^,]+,([^,]+),[^,]+,[^,]+", entry).groups()[0]
+                partition = re.search("[^,]+,([^,]+),[^,]+,[^,]+.*", entry).groups()[0]
             except:
                 authenticator.log.info(
                     f"----- {authentication['name']} - Failed to check for defaults partitions: {entry} ---- {hpc_list}"