diff --git a/lib/galaxy/util/bool_expressions.py b/lib/galaxy/util/bool_expressions.py
index 6a40edcaef3..5e0825d6442 100644
--- a/lib/galaxy/util/bool_expressions.py
+++ b/lib/galaxy/util/bool_expressions.py
@@ -29,7 +29,7 @@ ParserElement.enablePackrat()
 
 # Defines the allowed characters that form a valid token.
 # Tokens that don't match this format will raise an exception when found.
-DEFAULT_TOKEN_FORMAT = alphanums + "_"
+DEFAULT_TOKEN_FORMAT = alphanums + "_-@."
 
 TRUE = Keyword("True")
 FALSE = Keyword("False")
@@ -125,7 +125,7 @@ class BooleanExpressionEvaluator:
         :param evaluator: The custom TokenEvaluator used to transform any token into a boolean.
         :type evaluator:  TokenEvaluator
         :param token_format: A string of all allowed characters used to form a valid token, defaults to None.
-                             The default value (None) will use DEFAULT_TOKEN_FORMAT which means the allowed characters are [A-Za-z0-9_].
+                             The default value (None) will use DEFAULT_TOKEN_FORMAT which means the allowed characters are [A-Za-z0-9_-@.].
         :type token_format:  Optional[str]
         """
         action = BoolOperand