diff --git a/packages/kb.gbapp/dialogs/FaqDialog.ts b/packages/kb.gbapp/dialogs/FaqDialog.ts
index 745ed814..69bf1839 100644
--- a/packages/kb.gbapp/dialogs/FaqDialog.ts
+++ b/packages/kb.gbapp/dialogs/FaqDialog.ts
@@ -65,7 +65,6 @@ export class FaqDialog extends IGBDialog {
           });
 
           await step.context.sendActivity(Messages[locale].see_faq); // TODO: RND messages.
-          await step.endDialog();
           return await step.next();
         }
       }
diff --git a/packages/kb.gbapp/dialogs/MenuDialog.ts b/packages/kb.gbapp/dialogs/MenuDialog.ts
index fece9fc0..95726b01 100644
--- a/packages/kb.gbapp/dialogs/MenuDialog.ts
+++ b/packages/kb.gbapp/dialogs/MenuDialog.ts
@@ -77,7 +77,7 @@ export class MenuDialog extends IGBDialog {
 
           // Adds to bot a perception of a new subject.
 
-          const user = await min.userProfile.get(context, {});
+          const user = await min.userProfile.get(step.context, {});
           user.subjects.push(subject);
           rootSubjectId = subject.subjectId;
 
@@ -94,7 +94,7 @@ export class MenuDialog extends IGBDialog {
             });
           }
         } else {
-          const user = await min.userProfile.get(context, {});
+          const user = await min.userProfile.get(step.context, {});
           user.subjects = [];
 
           await step.context.sendActivity(Messages[locale].here_is_subjects); // TODO: Handle rnd.
@@ -139,7 +139,7 @@ export class MenuDialog extends IGBDialog {
         });
 
         if (attachments.length === 0) {
-          const user = await min.userProfile.get(context, {});
+          const user = await min.userProfile.get(step.context, {});
 
           if (user.subjects && user.subjects.length > 0) {
             await step.context.sendActivity(
@@ -155,7 +155,7 @@ export class MenuDialog extends IGBDialog {
           await step.context.sendActivity(msg);
         }
 
-        const user = await min.userProfile.get(context, {});
+        const user = await min.userProfile.get(step.context, {});
         user.isAsking = true;
         return await step.next();
       },