diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index 27d91d12642..a0f5fa10482 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -38,8 +38,8 @@
             <field name="res_model">survey.question.wiz</field>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
-            <field name="target">new</field>
-            <field name="context">{'survey_id': survey_id, 'survey_token': survey_token}</field>
+            <field name="target">inline</field>
+            <field name="context">{'survey_id': active_id, 'survey_token': params, 'ir_actions_act_window_target': 'inline'}</field>
         </record>
 
     </data>
diff --git a/addons/survey/wizard/survey_send_invitation.xml b/addons/survey/wizard/survey_send_invitation.xml
index f2879990b9c..be7e73e278c 100644
--- a/addons/survey/wizard/survey_send_invitation.xml
+++ b/addons/survey/wizard/survey_send_invitation.xml
@@ -14,7 +14,7 @@
     <p>Hello,</p>
     <p>
         Would you please spent some of your time to fill-in our survey: 
-        <a href="#action=survey.action_answer_survey&survey_id=${object.id}&survey_token=__TOKEN__">${object.title}</a>
+        <a href="#action=survey.action_answer_survey&active_id=${object.id}&token=__TOKEN__">${object.title}</a>
     </p>
     % if object.responsible_id:
     <p>Thank you for choosing ${object.responsible_id.company_id.name or 'us'}!</p>