diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java b/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java
index 70ba76e0d..23cf5c600 100644
--- a/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java
+++ b/core/src/main/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java
@@ -481,12 +481,14 @@ private void saveVCard() {
         }
         
 	try {
-	    final VCardManager vcardManager = SparkManager.getVCardManager();
-	    vcardManager.setPersonalVCard(vcard);
-
+        // Save vcard on server
         org.jivesoftware.smackx.vcardtemp.VCardManager smackVCardManager = org.jivesoftware.smackx.vcardtemp.VCardManager.getInstanceFor( SparkManager.getConnection() );
         smackVCardManager.saveVCard( vcard );
 
+        // Save vcard on client
+        final VCardManager vcardManager = SparkManager.getVCardManager();
+        vcardManager.setPersonalVCard(vcard);
+
 	    // Notify users.
 	    if (avatarBytes != null) {
 		Presence presence = SparkManager.getWorkspace().getStatusBar()
@@ -498,7 +500,7 @@ private void saveVCard() {
 		// Change my own presence
 		SparkManager.getSessionManager().changePresence(newPresence);
 
-		// Chnage avatar in status bar.
+		// Change avatar in status bar.
 		StatusBar statusBar = SparkManager.getWorkspace()
 			.getStatusBar();
 		statusBar.setAvatar(new ImageIcon(vcard.getAvatar()));