diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index 4422ef770be..9b8e5934f55 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -91,8 +91,8 @@ class crm_configuration(osv.osv_memory):
         elif server_type == 'imap':
             port = ssl and 993 or 143
         else:
-            values['server'] = ''
-        values['port'] = port
+            values['default_server'] = ''
+        values['default_port'] = port
         return {'value': values}
     
     def set_email_configurations(self, cr, uid, ids, context=None):
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index e1b391cc676..735584f7c74 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -15,9 +15,9 @@
                         <newline/>
                         <group col="4" colspan="2" attrs="{'invisible': [('fetchmail_crm','=',False)]}">
                             <field name="default_server" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
-                            <field name="default_type" nolabel="1" on_change="onchange_server_type(type, is_ssl)" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
+                            <field name="default_type" nolabel="1" on_change="onchange_server_type(default_type, default_is_ssl)" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
                             <field name="default_port" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
-                            <field name="default_is_ssl" on_change="onchange_server_type(type, is_ssl)"/>
+                            <field name="default_is_ssl" on_change="onchange_server_type(default_type, default_is_ssl)"/>
                             <newline/>
                             <field name="default_user" attrs="{'required': [('fetchmail_crm','=',True)]}"/>
                             <field name="default_password" password="True" attrs="{'required': [('fetchmail_crm','=',True)]}"/>