diff --git a/web-assets/auth0/dev-tenant/rules/onboardingChecklist.js b/web-assets/auth0/dev-tenant/rules/onboardingChecklist.js
index a443ceb..039b6b6 100644
--- a/web-assets/auth0/dev-tenant/rules/onboardingChecklist.js
+++ b/web-assets/auth0/dev-tenant/rules/onboardingChecklist.js
@@ -11,14 +11,30 @@ function (user, context, callback) {
         const _ = require('lodash');
         const moment = require('moment');
 
+        const isSocial = _.get(user, "identities[0].isSocial");
+        const connection = _.get(user, "identities[0].connection");
+
+        console.log("rule:onboarding-checklist: isSocial/connection", isSocial + "/" + connection);
+        console.log("rule:onboarding-checklist: WIPRO_SS_AZURE_AD_CONNECTION_NAME", configuration.WIPRO_SSO_AZURE_AD_CONNECTION_NAME);
+
+        if (_.includes([configuration.WIPRO_SSO_AZURE_AD_CONNECTION_NAME], connection)) {
+            console.log("rule:onboarding-checklist:exiting due to user being an enterprise user.");
+            return callback(null, user, context);
+        }
+
         let handle = _.get(user, "handle", null);
         const provider = _.get(user, "identities[0].provider", null);
-        if (!handle && provider === "auth0") {
+        if (isSocial || (!handle && provider === "auth0")) {
           handle = _.get(user, "nickname", null);
         }
 
         console.log("rule:onboarding-checklist: fetch onboarding_checklist for email/handle: ", user.email, handle, provider);
 
+        // TODO: Properly fetch handle for social logins
+        if (handle == null || isSocial) {
+            return callback(null, user, context);
+        }
+
         const createdAt = _.get(user, "created_at", null);
         const thresholdDate = moment(configuration.PROFILE_CREATION_DATE_THRESHOLD, "YYYY-MM-DD");