1 files changed, 5 insertions, 2 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 7bc5bde..c4a7b10 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1028,6 +1028,6 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
-        cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) );
-        cmbFileAs->insertItem( parseName( textChanged, NAME_FMLS ) );
         cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) );
         cmbFileAs->insertItem( parseName( textChanged, NAME_LFM ) );
+        cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) );
+        cmbFileAs->insertItem( parseName( textChanged, NAME_FMLS ) );
 
@@ -1157,2 +1157,5 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
+        if ( strFirstName == strLastName )
+                strFirstName = "";
+
         qWarning(" strFirstName: %s",  strFirstName.latin1());