diff --git a/django_mailbox/models.py b/django_mailbox/models.py
index 3ad282a..e499841 100644
--- a/django_mailbox/models.py
+++ b/django_mailbox/models.py
@@ -233,7 +233,7 @@ class Mailbox(models.Model):
                 folder=self.folder,
                 archive=self.archive
             )
-            conn.connect(self.client_id, self.client_secret, self.tenant_id)
+            conn.connect()
         elif self.type == 'pop3':
             conn = Pop3Transport(
                 self.location,
diff --git a/django_mailbox/transports/office365.py b/django_mailbox/transports/office365.py
index 53e7aa3..f8d4a29 100644
--- a/django_mailbox/transports/office365.py
+++ b/django_mailbox/transports/office365.py
@@ -87,7 +87,7 @@ class Office365Transport(EmailTransport):
         self.archive = archive
         self.folder = folder
 
-    def connect(self, client_id, client_secret, tenant_id):
+    def connect(self):
         try:
             import O365
         except ImportError:
@@ -95,9 +95,9 @@ class Office365Transport(EmailTransport):
                 "Install o365 to use oauth2 auth for office365"
             )
 
-        credentials = (client_id, client_secret)
+        credentials = (settings.MICROSOFT_O365_CLIENT_ID, settings.MICROSOFT_O365_CLIENT_SECRET)
 
-        self.account = O365.Account(credentials, auth_flow_type='credentials', tenant_id=tenant_id)
+        self.account = O365.Account(credentials, auth_flow_type='credentials', tenant_id=settings.MICROSOFT_O365_TENENT_ID)
         self.account.authenticate()
 
         self.mailbox = self.account.mailbox(resource=self.username)