diff --git a/pybis/src/python/pybis/pybis.py b/pybis/src/python/pybis/pybis.py
index 5b01f1fd2c2aa9faee6ddc73dca9b8f7bf1f390e..9354ad34bf216f2c68131cbad83f006277627454 100644
--- a/pybis/src/python/pybis/pybis.py
+++ b/pybis/src/python/pybis/pybis.py
@@ -684,7 +684,8 @@ class Openbis:
 
     def _get_username(self):
         if self.token:
-            username, rest = self.token.split('-')
+            match = re.search(r'(?P<username>.*)-.*', self.token)
+            username = match.groupdict()['username']
             return username
         return ''