diff --git a/firstname_display_name_trigger/res_partner.py b/firstname_display_name_trigger/res_partner.py
index f02fed714..547233913 100644
--- a/firstname_display_name_trigger/res_partner.py
+++ b/firstname_display_name_trigger/res_partner.py
@@ -37,8 +37,10 @@ class ResPartner(orm.Model):
             ids = [ids]
         res = []
         for record in self.browse(cr, uid, ids, context=context):
-            name = '%s %s'%(record.lastname if record.lastname else u"",
-                            record.firstname if record.firstname else u"")
+            name = '%s%s%s' % (record.lastname if record.lastname else u"",
+                               u" " if record.firstname and record.lastname
+                                    else u"",
+                               record.firstname if record.firstname else u"")
             if record.parent_id and not record.is_company:
                 name =  "%s, %s" % (record.parent_id.name, name)
             if context.get('show_address'):