diff --git a/addons/base_setup/__init__.py b/addons/base_setup/__init__.py
index 3b78c6cb557..efdcfe16135 100644
--- a/addons/base_setup/__init__.py
+++ b/addons/base_setup/__init__.py
@@ -48,7 +48,7 @@ class base_setup_config_choice(osv.osv_memory):
         user_ids = user_obj.search(cr, uid, [])
         users = user_obj.browse(cr, uid, user_ids)
         user_str = '\n'.join(map(lambda x: '    - %s: %s / %s' % (x.name, x.login, x.password), users))
-        return _('The following users have been installed on your database: \n')+ user_str
+        return _('The following users have been installed : \n')+ user_str
 
     _columns = {
         'installed_users':fields.text('Installed Users', readonly=True),
diff --git a/addons/base_setup/base_setup_data.xml b/addons/base_setup/base_setup_data.xml
index 024accc77ce..2f53f2c322d 100644
--- a/addons/base_setup/base_setup_data.xml
+++ b/addons/base_setup/base_setup_data.xml
@@ -16,7 +16,7 @@
               	<separator string="" position="vertical" colspan="1" rowspan="8"/>
             	<group colspan="4" width="400">
               		<separator string="Installation Done" colspan="4"/>
-              		<label align="0.0" string="Your new database is now fully installed." colspan="4"/>
+              		<label align="0.0" string="Your database is now created." colspan="4"/>
        				<field name="installed_users" nolabel= "1" colspan="4"/>
             	</group>
 			</group>
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index ae7ae7f23c7..5db25283777 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -11,7 +11,7 @@
             <attribute name="string">Main Company Setup</attribute>
           </form>
           <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders,...</attribute>
+                <attribute name="string">Information of your company will be used to custiomise your documents like Invoices, Sale Orders and many more.</attribute>
           </xpath>
           <xpath expr='//separator[@string="title"]' position='attributes'>
                     <attribute name='string'>Configure Your Company</attribute>
@@ -24,16 +24,16 @@
               <group colspan="5">
                   <group colspan="2">
                     <field name="company_id" invisible="1"/>
-                    <field name="name" required="True"/><field name="account_no"/>
-                    <field name="currency" widget="selection"/><field name="street"/>
-                    <field name="street2"/>
-                    <field name="country_id"/>
+                    <field name="name" required="True"/><field name="website"/>
+                    <field name="street"/><field name="street2"/>
                     <field name="zip"/>
-                    <field name="state_id"/>
                     <field name="city"/>
-                    <field name="email"/>
+                    <field name="country_id"/>
+                    <field name="state_id"/>
                     <field name="phone"/>
-                    <field name="website"/>
+                    <field name="email"/>
+                    <field name="account_no"/>
+                    <field name="currency" widget="selection"/>
                 </group>
                 <newline/>
                 <group colspan="2" groups="base.group_extended">