diff --git a/addons/account/installer.py b/addons/account/installer.py
index e10bbae21b7d20251b59a772557bcb0564fcedb0..2dd8c11cba54764b4ffd86eac36f65b7a20fce67 100644
--- a/addons/account/installer.py
+++ b/addons/account/installer.py
@@ -85,6 +85,7 @@ class account_installer(osv.osv_memory):
         'period':lambda *a:'month',
         'sale_tax':lambda *a:0.0,
         'purchase_tax':lambda *a:0.0,
+        'charts':'configurable',
         }
 
     def on_change_start_date(self, cr, uid, id, start_date):
diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py
index 112d66d2919a43e2fbb48642f49beb7225ed923f..03fd0822b8e08d0265cf172773e3b845c9413358 100644
--- a/addons/base_setup/gtk_contact_form.py
+++ b/addons/base_setup/gtk_contact_form.py
@@ -69,7 +69,6 @@ class base_gtkcontactform(osv.osv_memory):
              'other':fields.boolean('Other'),
              'ebook':fields.boolean('ebook'),
              'updates':fields.boolean('updates'),
-             #'note':fields.text('Note'),
              }
     def execute(self, cr, uid, ids, context=None):
         company_id = self.pool.get('base.setup.company').search(cr, uid, [])
@@ -89,7 +88,6 @@ class base_gtkcontactform(osv.osv_memory):
             result += "\nplan_use: " +  str(res.get('use_openerp', False))
             result += "\nsell_openerp: " + str(res.get('sell_openerp', False))
             result += "\nebook: " + str(res.get('ebook',False))
-            result += "\nnote: " + str(res.get('note',''))
             result += "\ngtk: " + str(True)
         misc.upload_data(email, result, type='SURVEY')
 
diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml
index ab0c2dfe8ab29db51972b94df1eef4467e45bb16..b220db020c6f90772c3799ff0a59297f0b971ac6 100644
--- a/addons/base_setup/gtk_contact_form.xml
+++ b/addons/base_setup/gtk_contact_form.xml
@@ -18,7 +18,7 @@
 	          	  <attribute name='colspan'>4</attribute>
 	      </xpath>
 	      <xpath expr='//separator[@string="vsep"]' position='attributes'>
-	          	  <attribute name='rowspan'>24</attribute>
+	          	  <attribute name='rowspan'>22</attribute>
 	          	  <attribute name='string'></attribute>
 	      </xpath>
           <group string="res_config_contents" position="replace">