diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 016eca99a78..853370132de 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -36,9 +36,9 @@
                    'survey_data.xml',
                    'wizard/survey_selection.xml',
                    'wizard/survey_answer.xml',
-                   'survey_view.xml',
                    'security/survey_security.xml',
                    'security/ir.model.access.csv',
+                   'survey_view.xml',
                    'wizard/survey_print_statistics.xml',
                    'wizard/survey_print_answer.xml',
                    'wizard/survey_browse_answer.xml',
diff --git a/addons/survey/security/ir.model.access.csv b/addons/survey/security/ir.model.access.csv
index aebd468c0a0..a600fcdb961 100644
--- a/addons/survey/security/ir.model.access.csv
+++ b/addons/survey/security/ir.model.access.csv
@@ -1,31 +1,34 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_survey_type","survey.type","model_survey_type","group_survey_manager",1,1,1,1
-"access_survey_type","survey.type","model_survey_type","group_survey_user",1,1,1,1
-"access_survey_manager","survey","model_survey","group_survey_manager",1,1,1,1
-"access_survey_user","survey","model_survey","group_survey_user",1,1,0,0
-"access_survey_page_manager","survey.page","model_survey_page","group_survey_manager",1,1,1,1
-"access_survey_page_user","survey.page","model_survey_page","group_survey_user",1,0,0,0
-"access_survey_question_manager","survey.question","model_survey_question","group_survey_manager",1,1,1,1
-"access_survey_question_user","survey.question","model_survey_question","group_survey_user",1,0,0,0
-"access_survey_answer_manager","survey.answer","model_survey_answer","group_survey_manager",1,1,1,1
-"access_survey_answer_user","survey.answer","model_survey_answer","group_survey_user",1,0,0,0
-"access_survey_response_manager","survey.response","model_survey_response","group_survey_manager",1,1,1,1
-"access_survey_response_user","survey.response","model_survey_response","group_survey_user",1,1,1,1
-"access_survey_response_answer_manager","survey.response.answer","model_survey_response_answer","group_survey_manager",1,1,1,1
-"access_survey_response_answer_user","survey.response.answer","model_survey_response_answer","group_survey_user",1,1,1,1
-"access_survey_history","survey.history","model_survey_history","group_survey_user",1,1,1,0
-"access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","group_survey_manager",1,1,1,1
-"access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","group_survey_user",1,0,0,0
-"access_survey_request","survey.request","model_survey_request","group_survey_manager",1,1,1,1
-"access_survey_request","survey.request","model_survey_request","group_survey_user",1,0,0,0
-"access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","group_survey_manager",1,1,1,1
-"access_survey_tbl_column_heading","survey.tbl.column.heading","model_survey_tbl_column_heading","group_survey_user",1,1,1,1
-"access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_manager",1,1,1,1
-"access_survey_response_line","survey.response.line","model_survey_response_line","group_survey_user",1,1,1,1
+"access_survey_type_manager","survey.type manager","model_survey_type","base.group_survey_manager",1,1,1,1
+"access_survey_type_user","survey.type user","model_survey_type","base.group_survey_user",1,1,1,1
+"access_survey_manager","survey","model_survey","base.group_survey_manager",1,0,0,0
+"access_survey_system","survey","model_survey","base.group_system",1,0,0,0
+"access_survey_user","survey","model_survey","base.group_survey_user",1,1,1,1
+"access_survey_page_manager","survey.page manager","model_survey_page","base.group_survey_manager",1,0,0,0
+"access_survey_page_system","survey.page system","model_survey_page","base.group_system",1,0,0,0
+"access_survey_page_user","survey.page user","model_survey_page","base.group_survey_user",1,1,1,1
+"access_survey_question_manager","survey.question manager","model_survey_question","base.group_survey_manager",1,1,1,1
+"access_survey_question_user","survey.question user","model_survey_question","base.group_survey_user",1,1,1,1
+"access_survey_answer_manager","survey.answer manager","model_survey_answer","base.group_survey_manager",1,1,1,1
+"access_survey_answer_user","survey.answer user","model_survey_answer","base.group_survey_user",1,1,1,1
+"access_survey_response_manager","survey.response manager","model_survey_response","base.group_survey_manager",1,1,1,1
+"access_survey_response_user","survey.response user","model_survey_response","base.group_survey_user",1,1,1,1
+"access_survey_response_answer_manager","survey.response.answer manager","model_survey_response_answer","base.group_survey_manager",1,1,1,1
+"access_survey_response_answer_user","survey.response.answer user","model_survey_response_answer","base.group_survey_user",1,1,1,1
+"access_survey_history_user","survey.history.user","model_survey_history","base.group_survey_user",1,1,1,1
+"access_survey_question_column_heading_manager","survey.question.column.heading manager","model_survey_question_column_heading","base.group_survey_manager",1,1,1,1
+"access_survey_question_column_heading_user","survey.question.column.heading user","model_survey_question_column_heading","base.group_survey_user",1,0,0,0
+"access_survey_request_manager","survey.request manager","model_survey_request","base.group_survey_manager",1,0,0,0
+"access_survey_request_user","survey.request user","model_survey_request","base.group_survey_user",1,1,1,1
+"access_survey_request_system","survey.request system","model_survey_request","base.group_system",1,0,0,0
+"access_survey_tbl_column_heading_manager","survey.tbl.column.heading manager","model_survey_tbl_column_heading","base.group_survey_manager",1,1,1,1
+"access_survey_tbl_column_heading_user","survey.tbl.column.heading user","model_survey_tbl_column_heading","base.group_survey_user",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_manager",1,1,1,1
+"access_survey_response_line_manager","survey.response.line manager","model_survey_response_line","base.group_survey_user",1,1,1,1
 "access_survey_name_wiz_sale","survey.name.wiz.sale","model_survey_name_wiz","base.group_sale_salesman",1,1,0,0
 "access_survey_type","survey.type","model_survey_type","base.group_hr_manager",1,1,1,1
 "access_survey","survey","model_survey","base.group_hr_manager",1,1,1,1
-"access_survey_history","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
+"access_survey_history_manager","survey.history","model_survey_history","base.group_hr_manager",1,1,1,1
 "access_survey_page","survey.page","model_survey_page","base.group_hr_manager",1,1,1,1
 "access_survey_question","survey.question","model_survey_question","base.group_hr_manager",1,1,1,1
 "access_survey_question_column_heading","survey.question.column.heading","model_survey_question_column_heading","base.group_hr_manager",1,1,1,1
@@ -36,3 +39,10 @@
 "access_survey_response_answer","survey.response.answer","model_survey_response_answer","base.group_hr_manager",1,1,1,1
 "access_survey_res_users","res.users","base.model_res_users","base.group_hr_manager",1,1,1,1
 "access_survey_request","survey.request","model_survey_request","base.group_hr_manager",1,1,1,1
+"access_survey_name_wiz_user","survey.name.wiz.user","model_survey_name_wiz","base.group_survey_user",1,1,1,0
+"access_survey_history_survey_manager","survey.history manager","model_survey_history","base.group_survey_manager",1,0,0,0
+"access_survey_name_wiz_system","survey.name.wiz.system","model_survey_name_wiz","base.group_system",1,0,0,0
+"access_survey_type_system","survey.type system","model_survey_type","base.group_system",1,0,0,0
+"access_survey_question_system","survey.question system","model_survey_question","base.group_system",1,0,0,0
+"access_survey_history_system","survey.history.system","model_survey_history","base.group_system",1,0,0,0
+"access_survey_answer_system","survey.answer system","model_survey_answer","base.group_system",1,0,0,0
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 67494b5a293..d59f4b02c4d 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -11,6 +11,12 @@
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
+   	<record model="res.groups" id="base.group_survey_manager">
+        	<field name="name">Tools / Manager</field>
+   		</record>
+   	<record model="res.groups" id="base.group_survey_user">
+        	<field name="name">Tools / User</field>
+   	</record>
 
 </data>
 </openerp>
diff --git a/addons/survey/survey_data.xml b/addons/survey/survey_data.xml
index 29cb534a672..dfc63a51294 100644
--- a/addons/survey/survey_data.xml
+++ b/addons/survey/survey_data.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-   	    <record model="res.groups" id="group_survey_manager">
-        	<field name="name">Tools / Manager</field>
-   		</record>
-   	    <record model="res.groups" id="group_survey_user">
-        	<field name="name">Tools / User</field>
-   		</record>
+<!--   	    <record model="res.groups" id="base.group_survey_manager">-->
+<!--        	<field name="name">Tools / Manager</field>-->
+<!--   		</record>-->
+<!--   	    <record model="res.groups" id="base.group_survey_user">-->
+<!--        	<field name="name">Tools / User</field>-->
+<!--   		</record>-->
    	</data>
 </openerp>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 2da132de509..32070672cbf 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -4,13 +4,13 @@
 
             <menuitem icon="STOCK_PREFERENCES" id="base.menu_tools" name="Tools" sequence="28"/>
             <menuitem name="Surveys" id="menu_surveys" parent="base.menu_tools"
-                        groups="group_survey_manager,group_survey_user" sequence="2"/>
+                        groups="base.group_survey_manager,base.group_survey_user,base.group_system" sequence="2"/>
             <menuitem name="Define Surveys" id="menu_define_survey"
-                 groups="group_survey_manager"
+                 groups="base.group_survey_manager,base.group_survey_user,base.group_system"
                  parent="menu_surveys" />
-            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="group_survey_manager,group_survey_user"/>
+            <menuitem id="menu_answer_surveys" name="Answer Surveys" parent="menu_surveys" groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
             <menuitem name="Reporting" parent="base.menu_tools"
-                id="base.menu_lunch_reporting" groups="group_survey_manager" sequence="6"/>
+                id="base.menu_lunch_reporting" groups="base.group_survey_manager" sequence="6"/>
             <menuitem name="Surveys" id="menu_reporting" parent="base.menu_lunch_reporting" sequence="2"/>
         <!--
             Survey
@@ -291,7 +291,7 @@
 
         <menuitem name="Surveys" id="menu_survey_form"
             action="action_survey_form1" parent="menu_define_survey"
-            groups="group_survey_manager"/>
+            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
 
         <!--
             Survey Pages
@@ -491,7 +491,7 @@
 
         <menuitem name="Pages" id="menu_survey_page_form1"
             action="action_survey_page_form" parent='menu_define_survey'
-            groups="group_survey_manager"/>
+            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
 
         <record model="ir.ui.view" id="survey_page_wizard_test1">
             <field name="name">survey_page_wizard_test</field>
@@ -1116,7 +1116,7 @@
 
         <menuitem name="Survey Requests" id="menu_survey_type_form1"
             action="action_survey_request_tree" parent='menu_answer_surveys'
-            groups="group_survey_manager"/>
+            groups="base.group_survey_manager,base.group_survey_user,base.group_system"/>
 
         <!--
             Survey Type
@@ -1191,7 +1191,7 @@
 
         <menuitem name="Answer a Survey" id="menu_run_survey_form" sequence="2"
             action="action_view_survey_name" parent="menu_answer_surveys"
-            groups="group_survey_manager,group_survey_user" icon="STOCK_INDEX"/>
+            groups="base.group_survey_manager,base.group_survey_user,base.group_system" icon="STOCK_INDEX"/>
 
     </data>
 </openerp>
diff --git a/addons/survey/wizard/survey_browse_answer.xml b/addons/survey/wizard/survey_browse_answer.xml
index f08d4d7185b..1a0da339483 100644
--- a/addons/survey/wizard/survey_browse_answer.xml
+++ b/addons/survey/wizard/survey_browse_answer.xml
@@ -35,7 +35,7 @@
 
 		<menuitem name="Browse Answers" id="menu_browse_survey_response"
 			action="action_browse_survey_response" parent="menu_reporting"
-			groups="group_survey_manager" icon="STOCK_PRINT_PREVIEW"/>
+			groups="base.group_survey_manager" icon="STOCK_PRINT_PREVIEW"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/survey/wizard/survey_print.xml b/addons/survey/wizard/survey_print.xml
index 8f8793e6b1e..719eaa309e8 100644
--- a/addons/survey/wizard/survey_print.xml
+++ b/addons/survey/wizard/survey_print.xml
@@ -37,7 +37,7 @@
 
         <menuitem name="Surveys" id="menu_print_survey_form" sequence="1"
             action="action_view_survey_print" parent="menu_reporting"
-            groups="group_survey_manager" icon="STOCK_PRINT"/>
+            groups="base.group_survey_manager" icon="STOCK_PRINT"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/survey/wizard/survey_print_answer.xml b/addons/survey/wizard/survey_print_answer.xml
index 1e34fc1029f..e7a05dff6c4 100644
--- a/addons/survey/wizard/survey_print_answer.xml
+++ b/addons/survey/wizard/survey_print_answer.xml
@@ -37,7 +37,7 @@
 		</record>
 
 		<menuitem name="Surveys Answers" action="action_view_survey_print_answer" id="menu_print_survey_answer"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/survey/wizard/survey_print_statistics.xml b/addons/survey/wizard/survey_print_statistics.xml
index 5659b82e896..abb11336b90 100644
--- a/addons/survey/wizard/survey_print_statistics.xml
+++ b/addons/survey/wizard/survey_print_statistics.xml
@@ -31,7 +31,7 @@
 		</record>
 
 		<menuitem name="Surveys Statistics" action="action_view_survey_print_statistics" id="menu_print_survey_statistics"
-			parent="menu_reporting" icon="STOCK_PRINT" groups="group_survey_manager"/>
+			parent="menu_reporting" icon="STOCK_PRINT" groups="base.group_survey_manager"/>
 
 	</data>
-</openerp>
\ No newline at end of file
+</openerp>