diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts
index 8dce8dc9..cf077250 100644
--- a/packages/core.gbapp/services/GBConversationalService.ts
+++ b/packages/core.gbapp/services/GBConversationalService.ts
@@ -516,7 +516,8 @@ export class GBConversationalService {
       GBLog.info(`NLP called: ${intent} ${firstEntity}`);
 
       try {
-        await step.replaceDialog(`/${intent}`, nlp.entities);
+        step.activeDialog.state.otptions.entities = nlp.entities;
+        await step.replaceDialog(`/${intent}`, step.activeDialog.state.options );
 
         return true;
       } catch (error) {
diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index dd0fed06..691498ae 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -799,6 +799,7 @@ export class GBMinService {
         if (!handled) {
           await step.beginDialog('/answer', {
             query: query,
+            user: user ? user['dataValues'] : null,
             message: message
           });
         }