diff --git a/code/zato-cli/src/zato/cli/enmasse.py b/code/zato-cli/src/zato/cli/enmasse.py
index a006f2c5e1..da34a0fd84 100644
--- a/code/zato-cli/src/zato/cli/enmasse.py
+++ b/code/zato-cli/src/zato/cli/enmasse.py
@@ -707,10 +707,10 @@ class Include_Type:
 
     # Generic connections - Cloud Microsoft 365
     zato_generic_connection_microsoft_365: [
-        'type_',
         'name',
-        'client_id',
+        'type_',
         'tenant_id',
+        'client_id',
         'scopes',
     ]
 }
diff --git a/code/zato-common/src/zato/common/test/enmasse_/_template_simple_06.py b/code/zato-common/src/zato/common/test/enmasse_/_template_simple_06.py
index bb9fbd9f12..14d1b4486e 100644
--- a/code/zato-common/src/zato/common/test/enmasse_/_template_simple_06.py
+++ b/code/zato-common/src/zato/common/test/enmasse_/_template_simple_06.py
@@ -34,6 +34,15 @@
 
   - name: /demo/enmasse/simple-06/topic-01.{test_suffix}
   - name: /demo/enmasse/simple-06/topic-02.{test_suffix}
+
+zato_generic_connection:
+
+  - name: '{test_suffix}.Microsoft365'
+    type_: cloud-microsoft-365
+    tenant_id: {test_suffix} - My Teant ID
+    client_id: {test_suffix} - My Client ID
+    secret: "{test_suffix} - My Secret"
+    scopes: https://graph.microsoft.com/.default
 """
 
 # ################################################################################################################################
diff --git a/code/zato-server/src/zato/server/service/internal/generic/connection.py b/code/zato-server/src/zato/server/service/internal/generic/connection.py
index f201882c96..1e23c33190 100644
--- a/code/zato-server/src/zato/server/service/internal/generic/connection.py
+++ b/code/zato-server/src/zato/server/service/internal/generic/connection.py
@@ -413,6 +413,9 @@ class SimpleIO(ChangePasswordBase.SimpleIO):
 
     def _run_pre_handle_tasks_CLOUD_MICROSOFT_365(self, session:'any_', instance:'any_') -> 'None':
 
+        # Disabled, no longer in use
+        return
+
         # stdlib
         from json import dumps, loads
         from urllib.parse import parse_qs, urlsplit
@@ -426,12 +429,6 @@ def _run_pre_handle_tasks_CLOUD_MICROSOFT_365(self, session:'any_', instance:'an
         query = urlsplit(auth_url).query
         parsed = parse_qs(query)
 
-        self.logger.info('*' * 80)
-        self.logger.info('111 %r', auth_url)
-        self.logger.info('222 %r', query)
-        self.logger.info('333 %r', parsed)
-        self.logger.info('*' * 80)
-
         state = parsed['state']
         state = state[0]