diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts
index 6500ec79..dd55f1fe 100644
--- a/packages/admin.gbapp/dialogs/AdminDialog.ts
+++ b/packages/admin.gbapp/dialogs/AdminDialog.ts
@@ -122,7 +122,7 @@ export class AdminDialog extends IGBDialog {
         },
         async step => {
           const locale = step.context.activity.locale;
-          const sensitive = step.result;
+          const sensitive = step.context.activity['originalText'];
 
           if (sensitive === min.instance.adminPass) {
             await min.conversationalService.sendText(min, step, Messages[locale].welcome);
diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts
index 06c27db0..e0e01ab6 100644
--- a/packages/core.gbapp/services/GBConversationalService.ts
+++ b/packages/core.gbapp/services/GBConversationalService.ts
@@ -327,7 +327,7 @@ export class GBConversationalService {
     await min.whatsAppDirectLine.sendToDevice(mobile, message, conversationId);
   }
 
-  
+
   public static async getAudioBufferFromText(text): Promise<string> {
     return new Promise<string>(async (resolve, reject) => {
       const name = GBAdminService.getRndReadableIdentifier();
@@ -851,6 +851,8 @@ export class GBConversationalService {
     if (text.length > 5000) {
       text = text.substr(0, 4999);
       GBLog.warn(`Text that bot will translate will be truncated due to MSFT service limitations.`);
+    } else if (text.length == 2) {
+      return text;
     }
     text = text.replace('¿', '');