diff --git a/openerp/addons/base/res/res_country.py b/openerp/addons/base/res/res_country.py
index 35fb2a29ea7..98a3b769a11 100644
--- a/openerp/addons/base/res/res_country.py
+++ b/openerp/addons/base/res/res_country.py
@@ -47,7 +47,7 @@ class Country(osv.osv):
             help='The full name of the country.', required=True, translate=True),
         'code': fields.char('Country Code', size=2,
             help='The ISO country code in two chars.\n'
-            'You can use this field for quick search.', required=True),
+            'You can use this field for quick search.'),
         'address_format': fields.text('Address Format', help="""You can state here the usual format to use for the \
 addresses belonging to this country.\n\nYou can use the python-style string patern with all the field of the address \
 (for example, use '%(street)s' to display the field 'street') plus
diff --git a/openerp/addons/base/res/res_country_view.xml b/openerp/addons/base/res/res_country_view.xml
index 47b665426f9..8f64d330440 100644
--- a/openerp/addons/base/res/res_country_view.xml
+++ b/openerp/addons/base/res/res_country_view.xml
@@ -31,8 +31,7 @@
                             <field name="code"/>
                         </group>
                     </group>
-                    <label for="address_format" string="Address Format"/>
-                    <field name="address_format" colspan="4" groups="base.group_no_one"/>
+                    <field name="address_format" groups="base.group_no_one" placeholder="Address format..."/>
                 </form>
             </field>
         </record>