diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 95043c3e3d6..2ad8a7f4a63 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -198,7 +198,7 @@ class survey(osv.osv):
 
         id = ids[0]
         survey = self.browse(cr, uid, id, context=context)
-        context.update({'edit': False, 'survey_id': id, 'survey_token': survey.token})
+        context.update({'edit': False, 'survey_id': id, 'survey_token': survey.token, 'ir_actions_act_window_target': 'inline'})
         return {
             'view_type': 'form',
             'view_mode': 'form',
diff --git a/addons/survey/wizard/survey_answer.py b/addons/survey/wizard/survey_answer.py
index f5be2968792..efd93506a73 100644
--- a/addons/survey/wizard/survey_answer.py
+++ b/addons/survey/wizard/survey_answer.py
@@ -1166,12 +1166,13 @@ class survey_question_wiz(osv.osv_memory):
 
         ir_model_data = self.pool.get('ir.model.data')
         user_browse = self.pool.get('res.users').browse(cr, SUPERUSER_ID, uid, context=context)
-        model_id = ir_model_data.get_object_reference(cr, uid, 'portal', 'group_anonymous')
-        anonymous = model_id and model_id[1] in [x.id for x in user_browse.groups_id]
-        if anonymous:
-            model, view_id = ir_model_data.get_object_reference(cr, uid, 'survey', 'view_survey_complete_survey_anonymous')
-        else:
+        model_id = ir_model_data.get_object_reference(cr, uid, 'base', 'group_user')
+        employee = model_id and model_id[1] in [x.id for x in user_browse.groups_id]
+
+        if employee:
             model, view_id = ir_model_data.get_object_reference(cr, uid, 'survey', 'view_survey_complete_survey')
+        else:
+            model, view_id = ir_model_data.get_object_reference(cr, uid, 'survey', 'view_survey_complete_survey_external')
 
         self._survey_complete(cr, uid, context['survey_id'], context)
 
diff --git a/addons/survey/wizard/survey_answer.xml b/addons/survey/wizard/survey_answer.xml
index a27ec3e41f9..8095dba93e6 100644
--- a/addons/survey/wizard/survey_answer.xml
+++ b/addons/survey/wizard/survey_answer.xml
@@ -63,7 +63,7 @@
             </field>
         </record>
 
-        <record id="view_survey_complete_survey_anonymous" model="ir.ui.view">           
+        <record id="view_survey_complete_survey_external" model="ir.ui.view">           
             <field name="name">Complete Survey Answer</field>
             <field name="model">survey.question.wiz</field>
             <field name="priority">2</field>