diff --git a/deploy/core.gbapp/dialogs/WelcomeDialog.ts b/deploy/core.gbapp/dialogs/WelcomeDialog.ts
index 4b201415..55392c61 100644
--- a/deploy/core.gbapp/dialogs/WelcomeDialog.ts
+++ b/deploy/core.gbapp/dialogs/WelcomeDialog.ts
@@ -54,11 +54,12 @@ export class WelcomeDialog extends IGBDialog {
           const date = a.getHours();
           var msg =
             date < 12 ? "bom dia" : date < 18 ? "boa tarde" : "boa noite";
-          
+
           let messages = [`Oi, ${msg}.`, `Oi!`, `Olá, ${msg}`, `Olá!`];
-          dc.context.sendActivity(messages[0]);
-  
-          if (dc.context.activity && dc.context.activity.text != "") {
+          await dc.context.sendActivity(messages[0]);
+
+          if (dc.context.activity && dc.context.activity.type == "message" &&
+            dc.context.activity.text != "") {
             await dc.replace("/answer", { query: dc.context.activity.text });
           }
         }
diff --git a/deploy/core.gbapp/models/GBModel.ts b/deploy/core.gbapp/models/GBModel.ts
index 5c263f51..d900635c 100644
--- a/deploy/core.gbapp/models/GBModel.ts
+++ b/deploy/core.gbapp/models/GBModel.ts
@@ -67,6 +67,8 @@ export class GuaribasInstance extends Model<GuaribasInstance> implements IGBInst
   @Column
   instanceId: number;
 
+  @Column applicationPrincipal: string;
+
   @Column
   whoAmIVideo: string;
 
diff --git a/deploy/core.gbapp/services/GBMinService.ts b/deploy/core.gbapp/services/GBMinService.ts
index 46573bb8..1cf292ef 100644
--- a/deploy/core.gbapp/services/GBMinService.ts
+++ b/deploy/core.gbapp/services/GBMinService.ts
@@ -33,7 +33,7 @@
 "use strict";
 
 const gBuilder = require("botbuilder");
-const {TextPrompt} = require("botbuilder-dialogs");
+const { TextPrompt } = require("botbuilder-dialogs");
 const UrlJoin = require("url-join");
 const Path = require("path");
 const Fs = require("fs");
@@ -229,8 +229,7 @@ export class GBMinService {
         logger.info(
           `GeneralBots(${instance.engineName}) listening on: ${url}.`
         );
-        
-        
+
 
         min.dialogs.add('textPrompt', new TextPrompt());
 
@@ -240,7 +239,7 @@ export class GBMinService {
 
             const state = conversationState.get(context);
             const dc = min.dialogs.createContext(context, state);
-            
+
             const user = min.userState.get(dc.context);
             if (!user.loaded) {
               min.conversationalService.sendEvent(
@@ -258,22 +257,40 @@ export class GBMinService {
               user.subjects = [];
             }
 
+            logger.info(
+              `[RCV]: ${context.activity.type}, ChannelID: ${context.activity.channelId},
+               ConversationID: ${context.activity.conversation.id},
+               Name: ${context.activity.name}, Text: ${context.activity.text}.`
+            );
+
             if (context.activity.type === "conversationUpdate" &&
               context.activity.membersAdded.length > 0) {
 
-              // TODO: Something when starting conversation here.
+              let member = context.activity.membersAdded[0];
+              if (member.name === "GeneralBots") {
+                logger.info(`Bot added to conversation, starting chat...`);
+                appPackages.forEach(e => {
+                  e.onNewSession(min, dc);
+                });
+                await dc.begin('/');
+              }
+              else {
+                logger.info(`Member added to conversation: ${member.name}`);
+              }
 
-              await dc.continue();
             } else if (context.activity.type === 'message') {
 
               // Check to see if anyone replied. If not then start echo dialog
 
-              if (!user.once) {
-                await dc.begin('/');
-              } else if (context.activity.name === "whoAmI") {
-                dc.begin("/whoAmI");
-              } else if (context.activity.text === "admin") {
+              if (context.activity.text === "admin") {
                 dc.begin("/admin");
+              } else {
+                await dc.continue();
+              }
+
+            } else if (context.activity.type === 'event') {
+              if (context.activity.name === "whoAmI") {
+                dc.begin("/whoAmI");
               } else if (context.activity.name === "showSubjects") {
                 dc.begin("/menu");
               } else if (context.activity.name === "giveFeedback") {
@@ -295,15 +312,6 @@ export class GBMinService {
                 await dc.continue();
               }
 
-
-              appPackages.forEach(e => {
-                e.onNewSession(min, dc);
-              });
-
-              logger.info(
-                `[RCV]: ChannelID: ${context.activity.channelId}, ConversationID: ${context.activity.conversation.id}
-               Type: ${context.activity.type}, Name: ${context.activity.name}, Text: ${context.activity.text}.`
-              );
             }
           });
         });
diff --git a/deploy/default.gbui/src/players/GBLoginPlayer.js b/deploy/default.gbui/src/players/GBLoginPlayer.js
index 969b0ed3..63730de4 100644
--- a/deploy/default.gbui/src/players/GBLoginPlayer.js
+++ b/deploy/default.gbui/src/players/GBLoginPlayer.js
@@ -35,7 +35,7 @@ import { UserAgentApplication } from "msal";
 
 class GBLoginPlayer extends React.Component {
 
-  constructor() {
+  constructor(tenant) {
     super();
     this.state = {
       token: "",