diff --git a/EDMC.py b/EDMC.py
index 06377fe6..126e1b5a 100755
--- a/EDMC.py
+++ b/EDMC.py
@@ -84,9 +84,9 @@ try:
         session = companion.Session()
         if config.get('cmdrs'):
             username = config.get('fdev_usernames')[0]
-            session.login(username, config.get_password(username), False)
+            session.login(username, config.get_password(username))
         else:	# <= 2.25 not yet migrated
-            session.login(config.get('username'), config.get('password'), False)
+            session.login(config.get('username'), config.get('password'))
         querytime = int(time())
         data = session.query()
         config.set('querytime', querytime)
diff --git a/companion.py b/companion.py
index b596d454..16bf0e6e 100644
--- a/companion.py
+++ b/companion.py
@@ -191,7 +191,7 @@ class Session:
         if platform=='win32' and getattr(sys, 'frozen', False):
             os.environ['REQUESTS_CA_BUNDLE'] = join(dirname(sys.executable), 'cacert.pem')
 
-    def login(self, username, password, is_beta):
+    def login(self, username=None, password=None, is_beta=False):
         if (not username or not password):
             if not self.credentials:
                 raise CredentialsError()