diff --git a/src/java/org/jivesoftware/spark/ui/ContactItem.java b/src/java/org/jivesoftware/spark/ui/ContactItem.java
index 3abaa7b5..2c07c03a 100644
--- a/src/java/org/jivesoftware/spark/ui/ContactItem.java
+++ b/src/java/org/jivesoftware/spark/ui/ContactItem.java
@@ -479,7 +479,7 @@ public class ContactItem extends JPanel {
                 }
                 else {
                     ImageIcon icon = new ImageIcon(url);
-                    icon = GraphicUtils.scale(icon, 16, 16);
+                    icon = GraphicUtils.scale(icon, 24, 24);
                     setSideIcon(icon);
                 }
             }
diff --git a/src/java/org/jivesoftware/sparkimpl/settings/local/SettingsManager.java b/src/java/org/jivesoftware/sparkimpl/settings/local/SettingsManager.java
index b4e5bdad..91da19c9 100644
--- a/src/java/org/jivesoftware/sparkimpl/settings/local/SettingsManager.java
+++ b/src/java/org/jivesoftware/sparkimpl/settings/local/SettingsManager.java
@@ -30,18 +30,28 @@ public class SettingsManager {
 
     private static List<PreferenceListener> listeners = new ArrayList<PreferenceListener>();
 
+    private static boolean fileExists = false;
+
     private SettingsManager() {
     }
 
     /**
-     * Returns the LocalPreferences for this agent.
+     * Returns the LocalPreferences for this user.
      *
-     * @return the LocalPreferences for this agent.
+     * @return the LocalPreferences for this user.
      */
     public static LocalPreferences getLocalPreferences() {
+        if(localPreferences != null){
+            return localPreferences;
+        }
 
-        if (!exists() && localPreferences == null) {
+        if (!fileExists) {
+            fileExists = exists();
+        }
+
+        if (!fileExists && localPreferences == null) {
             localPreferences = new LocalPreferences();
+            saveSettings();
         }
 
         if (localPreferences == null) {
@@ -50,7 +60,6 @@ public class SettingsManager {
             localPreferences = load();
         }
 
-
         return localPreferences;
     }