diff --git a/evennia/commands/default/player.py b/evennia/commands/default/player.py
index e4d35fe0ff..c1419a4358 100644
--- a/evennia/commands/default/player.py
+++ b/evennia/commands/default/player.py
@@ -509,8 +509,10 @@ class CmdOption(COMMAND_DEFAULT_CLASS):
                       "ENCODING": validate_encoding,
                       "MCCP": validate_bool,
                       "MXP": validate_bool,
-                      "OOB": validate_bool,
+                      "NOMARKUP": validate_bool,
                       "NOPKEEPALIVE": validate_bool,
+                      "OOB": validate_bool,
+                      "RAW": validate_bool,
                       "SCREENHEIGHT": validate_size,
                       "SCREENWIDTH": validate_size,
                       "SCREENREADER": validate_bool,
diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py
index 05912c5ec8..de707b1051 100644
--- a/evennia/server/portal/ssh.py
+++ b/evennia/server/portal/ssh.py
@@ -256,8 +256,8 @@ class SshProtocol(Manhole, session.Session):
         flags = self.protocol_flags
         xterm256 = options.get("xterm256", flags.get('XTERM256', False) if flags["TTYPE"] else True)
         useansi = options.get("ansi", flags.get('ANSI', False) if flags["TTYPE"] else True)
-        raw = options.get("raw", False)
-        nomarkup = options.get("nomarkup", not (xterm256 or useansi))
+        raw = options.get("raw", flags.get("RAW", False))
+        nomarkup = options.get("nomarkup", flags.get("NOMARKUP", not (xterm256 or useansi)))
         #echo = options.get("echo", None)
         screenreader =  options.get("screenreader", flags.get("SCREENREADER", False))
 
diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index d751bfa693..66c937f31e 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -321,8 +321,8 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
         flags = self.protocol_flags
         xterm256 = options.get("xterm256", flags.get('XTERM256', False) if flags["TTYPE"] else True)
         useansi = options.get("ansi", flags.get('ANSI', False) if flags["TTYPE"] else True)
-        raw = options.get("raw", False)
-        nomarkup = options.get("nomarkup", not (xterm256 or useansi))
+        raw = options.get("raw", flags.get("RAW", False))
+        nomarkup = options.get("nomarkup", flags.get("NOMARKUP", not (xterm256 or useansi)))
         echo = options.get("echo", None)
         mxp = options.get("mxp", flags.get("MXP", False))
         screenreader =  options.get("screenreader", flags.get("SCREENREADER", False))
diff --git a/evennia/server/portal/webclient.py b/evennia/server/portal/webclient.py
index 967c889c24..f9a47f0f99 100644
--- a/evennia/server/portal/webclient.py
+++ b/evennia/server/portal/webclient.py
@@ -161,8 +161,8 @@ class WebSocketClient(Protocol, Session):
         text = to_str(text, force_string=True)
 
         options = kwargs.pop("options", {})
-        raw = options.get("raw", False)
-        nomarkup = options.get("nomarkup", False)
+        raw = options.get("raw", flags.get("RAW", False))
+        nomarkup = options.get("nomarkup", flags.get("NOMARKUP", False))
         screenreader = options.get("screenreader", flags.get("SCREENREADER", False))
         prompt = options.get("send_prompt", False)
 
diff --git a/evennia/server/portal/webclient_ajax.py b/evennia/server/portal/webclient_ajax.py
index 3dc51ad4be..ec795d7152 100644
--- a/evennia/server/portal/webclient_ajax.py
+++ b/evennia/server/portal/webclient_ajax.py
@@ -347,8 +347,8 @@ class WebClientSession(session.Session):
         text = utils.to_str(text, force_string=True)
 
         options = kwargs.pop("options", {})
-        raw = options.get("raw", False)
-        nomarkup = options.get("nomarkup", False)
+        raw = options.get("raw", flags.get("RAW", False))
+        nomarkup = options.get("nomarkup", flags.get("NOMARKUP", False))
         screenreader = options.get("screenreader", flags.get("SCREENREADER", False))
         prompt = options.get("send_prompt", False)
 
diff --git a/evennia/server/session.py b/evennia/server/session.py
index bfd8625905..8efa713874 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -82,7 +82,9 @@ class Session(object):
 
         self.protocol_flags = {"ENCODING": "utf-8",
                                "SCREENREADER":False,
-                               "INPUTDEBUG": False}
+                               "INPUTDEBUG": False,
+                               "RAW": False,
+                               "NOMARKUP": False}
         self.server_data = {}
 
         # map of input data to session methods