diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts
index bf889f38..99034df7 100644
--- a/packages/admin.gbapp/dialogs/AdminDialog.ts
+++ b/packages/admin.gbapp/dialogs/AdminDialog.ts
@@ -74,6 +74,14 @@ export class AdminDialog extends IGBDialog {
 
     min.dialogs.add(
       new WaterfallDialog('/admin-auth', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
           const locale = step.context.activity.locale;
           const prompt = Messages[locale].authenticate;
@@ -98,6 +106,14 @@ export class AdminDialog extends IGBDialog {
 
     min.dialogs.add(
       new WaterfallDialog('/admin', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
           const locale = step.context.activity.locale;
           const prompt = Messages[locale].authenticate;
@@ -181,6 +197,14 @@ export class AdminDialog extends IGBDialog {
 
     min.dialogs.add(
       new WaterfallDialog('/install', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
           step.activeDialog.state.options.args = (step.options as any).args;
           if (step.activeDialog.state.options.confirm) {
@@ -212,6 +236,15 @@ export class AdminDialog extends IGBDialog {
 
     min.dialogs.add(
       new WaterfallDialog('/publish', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
+
         async step => {
           if (step.activeDialog.state.options.confirm || process.env.ADMIN_OPEN_PUBLISH === "true") {
             return await step.next('sim');
@@ -332,6 +365,15 @@ export class AdminDialog extends IGBDialog {
   private static setupSecurityDialogs(min: GBMinInstance) {
     min.dialogs.add(
       new WaterfallDialog('/setupSecurity', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
+
         async step => {
           const locale = step.context.activity.locale;
           const prompt = Messages[locale].enter_authenticator_tenant;
diff --git a/packages/core.gbapp/dialogs/BroadcastDialog.ts b/packages/core.gbapp/dialogs/BroadcastDialog.ts
index 8b560869..cbbf385b 100644
--- a/packages/core.gbapp/dialogs/BroadcastDialog.ts
+++ b/packages/core.gbapp/dialogs/BroadcastDialog.ts
@@ -56,13 +56,22 @@ export class BroadcastDialog extends IGBDialog {
   public static setup(bot: BotAdapter, min: GBMinInstance) {
     min.dialogs.add(
       new WaterfallDialog('/gb-broadcast', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
+
         async step => {
           const locale = step.context.activity.locale;
 
           return await min.conversationalService.prompt(min, step, 'Type the message and the broadcast will start.');
         },
         async step => {
-          await min.conversationalService['broadcast'](min, step.result);
+          // DISABLED: await min.conversationalService['broadcast'](min, step.result);
           return await step.next();
         }
       ])
diff --git a/packages/core.gbapp/dialogs/LanguageDialog.ts b/packages/core.gbapp/dialogs/LanguageDialog.ts
index 4fe24649..44beed2c 100644
--- a/packages/core.gbapp/dialogs/LanguageDialog.ts
+++ b/packages/core.gbapp/dialogs/LanguageDialog.ts
@@ -56,6 +56,14 @@ export class LanguageDialog extends IGBDialog {
    */
   public static setup(bot: BotAdapter, min: GBMinInstance) {
     min.dialogs.add(new WaterfallDialog('/language', [
+      async step => {
+        if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+          return await step.beginDialog('/auth');
+        }
+        else{
+          return await step.next(step.options);
+        }
+      },
 
       async step => {
         const locale = step.context.activity.locale;
diff --git a/packages/core.gbapp/dialogs/SwitchBot.ts b/packages/core.gbapp/dialogs/SwitchBot.ts
index c51b84ba..5480eaca 100644
--- a/packages/core.gbapp/dialogs/SwitchBot.ts
+++ b/packages/core.gbapp/dialogs/SwitchBot.ts
@@ -55,6 +55,14 @@ export class SwitchBotDialog extends IGBDialog {
    */
   public static setup(bot: BotAdapter, min: GBMinInstance) {
     min.dialogs.add(new WaterfallDialog('/bot', [
+      async step => {
+        if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+          return await step.beginDialog('/auth');
+        }
+        else{
+          return await step.next(step.options);
+        }
+      },
 
       async step => {
         const locale = step.context.activity.locale;
diff --git a/packages/core.gbapp/dialogs/WelcomeDialog.ts b/packages/core.gbapp/dialogs/WelcomeDialog.ts
index f39dd8fa..e38b17f4 100644
--- a/packages/core.gbapp/dialogs/WelcomeDialog.ts
+++ b/packages/core.gbapp/dialogs/WelcomeDialog.ts
@@ -57,6 +57,14 @@ export class WelcomeDialog extends IGBDialog {
 
     min.dialogs.add(new WaterfallDialog('/', [
       async step => {
+        if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+          return await step.beginDialog('/auth');
+        }
+        else{
+          return await step.next(step.options);
+        }
+      },
+    async step => {
 
         if (GBServer.globals.entryPointDialog !== null &&
           min.instance.botId === process.env.BOT_ID &&
diff --git a/packages/core.gbapp/dialogs/WhoAmIDialog.ts b/packages/core.gbapp/dialogs/WhoAmIDialog.ts
index 76c232ce..6512af73 100644
--- a/packages/core.gbapp/dialogs/WhoAmIDialog.ts
+++ b/packages/core.gbapp/dialogs/WhoAmIDialog.ts
@@ -53,6 +53,15 @@ export class WhoAmIDialog extends IGBDialog {
    */
   public static setup(bot: BotAdapter, min: GBMinInstance) {
     min.dialogs.add(new WaterfallDialog('/whoAmI', [
+      async step => {
+        if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+          return await step.beginDialog('/auth');
+        }
+        else{
+          return await step.next(step.options);
+        }
+      },
+
       async step => {
         const locale = step.context.activity.locale;
         await min.conversationalService.sendText(min, step, `${min.instance.description}`);
diff --git a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts
index 618484b8..3b700154 100644
--- a/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts
+++ b/packages/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts
@@ -70,6 +70,14 @@ export class FeedbackDialog extends IGBDialog {
 
     min.dialogs.add(
       new WaterfallDialog('/t', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
 
           const locale = step.context.activity.locale;
@@ -101,6 +109,14 @@ export class FeedbackDialog extends IGBDialog {
 
     min.dialogs.add(
       new WaterfallDialog('/qt', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
 
           const locale = step.context.activity.locale;
@@ -173,6 +189,14 @@ export class FeedbackDialog extends IGBDialog {
 
     min.dialogs.add(
       new WaterfallDialog('/feedbackNumber', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
           const locale = step.context.activity.locale;
 
@@ -192,6 +216,14 @@ export class FeedbackDialog extends IGBDialog {
 
     min.dialogs.add(
       new WaterfallDialog('/feedback', [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
           const locale = step.context.activity.locale;
 
diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts
index 060a0abf..147bfaaa 100644
--- a/packages/kb.gbapp/dialogs/AskDialog.ts
+++ b/packages/kb.gbapp/dialogs/AskDialog.ts
@@ -81,6 +81,14 @@ export class AskDialog extends IGBDialog {
   private static getAskDialog(min: GBMinInstance) {
     return [
       async step => {
+        if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+          return await step.beginDialog('/auth');
+        }
+        else{
+          return await step.next(step.options);
+        }
+      },
+    async step => {
         const locale = step.context.activity.locale;
         const user = await min.userProfile.get(step.context, {});
         user.isAsking = true;
@@ -144,6 +152,14 @@ export class AskDialog extends IGBDialog {
   private static getAnswerDialog(min: GBMinInstance, service: KBService) {
     return [
       async step => {
+        if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+          return await step.beginDialog('/auth');
+        }
+        else{
+          return await step.next(step.options);
+        }
+      },
+    async step => {
         let answer: GuaribasAnswer = null;
         const user = await min.userProfile.get(step.context, {});
 
@@ -258,6 +274,15 @@ export class AskDialog extends IGBDialog {
 
   private static getAnswerEventDialog(service: KBService, min: GBMinInstance) {
     return [
+      async step => {
+        if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+          return await step.beginDialog('/auth');
+        }
+        else{
+          return await step.next(step.options);
+        }
+      },
+
       async step => {
         const data = step.options as AskDialogArgs;
         if (data !== undefined && data.questionId !== undefined) {
diff --git a/packages/kb.gbapp/dialogs/FaqDialog.ts b/packages/kb.gbapp/dialogs/FaqDialog.ts
index a2bb70cb..9c4ea02b 100644
--- a/packages/kb.gbapp/dialogs/FaqDialog.ts
+++ b/packages/kb.gbapp/dialogs/FaqDialog.ts
@@ -58,6 +58,15 @@ export class FaqDialog extends IGBDialog {
     const service = new KBService(min.core.sequelize);
 
     min.dialogs.add(new WaterfallDialog('/faq', [
+      async step => {
+        if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+          return await step.beginDialog('/auth');
+        }
+        else{
+          return await step.next(step.options);
+        }
+      },
+
       async step => {
         const data = await service.getFaqBySubjectArray(min.instance.instanceId, 'faq', undefined);
         const locale = step.context.activity.locale;
diff --git a/packages/kb.gbapp/dialogs/MenuDialog.ts b/packages/kb.gbapp/dialogs/MenuDialog.ts
index 1bea453d..3df7ed8b 100644
--- a/packages/kb.gbapp/dialogs/MenuDialog.ts
+++ b/packages/kb.gbapp/dialogs/MenuDialog.ts
@@ -72,6 +72,15 @@ export class MenuDialog extends IGBDialog {
 
   private static getMenuDialog(min: GBMinInstance, service: KBService) {
     return [
+      async step => {
+        if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+          return await step.beginDialog('/auth');
+        }
+        else{
+          return await step.next(step.options);
+        }
+      },
+
       async step => {
         const locale = step.context.activity.locale;
         const user = await min.userProfile.get(step.context, {});
diff --git a/packages/security.gbapp/dialogs/ProfileDialog.ts b/packages/security.gbapp/dialogs/ProfileDialog.ts
index 714a4ca1..88725ff1 100644
--- a/packages/security.gbapp/dialogs/ProfileDialog.ts
+++ b/packages/security.gbapp/dialogs/ProfileDialog.ts
@@ -56,6 +56,14 @@ export class ProfileDialog extends IGBDialog {
 
     return {
       id: '/profile_name', waterfall: [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
           step.activeDialog.state.options = step.options;
           const locale = step.context.activity.locale;
@@ -87,6 +95,14 @@ export class ProfileDialog extends IGBDialog {
 
     return {
       id: '/profile_mobile', waterfall: [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
           step.activeDialog.state.options = step.options;
           const locale = step.context.activity.locale;
@@ -121,6 +137,14 @@ export class ProfileDialog extends IGBDialog {
 
     return {
       id: '/profile_mobile_confirm', waterfall: [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
           step.activeDialog.state.options = step.options;
           const locale = step.context.activity.locale;
@@ -151,6 +175,14 @@ export class ProfileDialog extends IGBDialog {
   public static getEmailDialog(min: GBMinInstance) {
     return {
       id: '/profile_email', waterfall: [
+        async step => {
+          if (step.context.activity.channelId !== 'msteams' && process.env.ENABLE_AUTH) {
+            return await step.beginDialog('/auth');
+          }
+          else{
+            return await step.next(step.options);
+          }
+        },
         async step => {
           const locale = step.context.activity.locale;
           await step.prompt('textPrompt', Messages[locale].whats_email);