diff --git a/evennia/server/portal/portalsessionhandler.py b/evennia/server/portal/portalsessionhandler.py
index 46323f13de..82a417c166 100644
--- a/evennia/server/portal/portalsessionhandler.py
+++ b/evennia/server/portal/portalsessionhandler.py
@@ -370,9 +370,9 @@ class PortalSessionHandler(SessionHandler):
             print ("portalsessionhandler.data_out:", session, kwargs)
             for cmdname, (cmdargs, cmdkwargs) in kwargs.iteritems():
                 try:
-                    getattr(session, "send_%s" % cmdname)(session, *cmdargs, **cmdkwargs)
+                    getattr(session, "send_%s" % cmdname)(*cmdargs, **cmdkwargs)
                 except AttributeError:
-                    session.send_default(session, cmdname, *cmdargs, **cmdkwargs)
+                    session.send_default(cmdname, *cmdargs, **cmdkwargs)
                 except Exception:
                     log_trace()
 
diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index 9df0aef86b..96da59b72f 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -289,6 +289,7 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
                         Note that it must be actively turned back on again!
 
         """
+        print "telnet.send_text", args,kwargs
         if args:
             text = args[0]
             if text is None:
diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py
index 35eb603830..0ceba6ce7b 100644
--- a/evennia/server/serversession.py
+++ b/evennia/server/serversession.py
@@ -355,8 +355,7 @@ class ServerSession(Session):
                 text, args = text[0], list(text[1:])
             else:
                 text, args = text, []
-            print("kwargs", kwargs, kwargs.get("options", {}))
-            options = kwargs.get("options", [None, {}])[1]
+            options = kwargs.get("options", None) or {}
             raw = options.get("raw", False)
             strip_inlinefunc = options.get("strip_inlinefunc", False)
             if _INLINEFUNC_ENABLED and not raw:
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index 1baa0877ed..545f6ddc23 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -244,7 +244,7 @@ class ServerSessionHandler(SessionHandler):
         # validate all scripts
         _ScriptDB.objects.validate()
         self[sess.sessid] = sess
-        self.data_in(sess, text=(CMD_LOGINSTART,))
+        self.data_in(sess, text=[[CMD_LOGINSTART],{}])
 
     def portal_session_sync(self, portalsessiondata):
         """