diff --git a/src/java/org/jivesoftware/LoginDialog.java b/src/java/org/jivesoftware/LoginDialog.java
index 5dcd9009..cc2ff6b5 100644
--- a/src/java/org/jivesoftware/LoginDialog.java
+++ b/src/java/org/jivesoftware/LoginDialog.java
@@ -1103,7 +1103,7 @@ public final class LoginDialog {
      */
     private void checkForOldSettings() throws Exception {
         // Check for old settings.xml
-        File settingsXML = new File(Spark.getUserSparkHome(), "/settings.xml");
+        File settingsXML = new File(Spark.getSparkUserHome(), "/settings.xml");
         if (settingsXML.exists()) {
             SAXReader saxReader = new SAXReader();
             Document pluginXML = null;
diff --git a/src/java/org/jivesoftware/Spark.java b/src/java/org/jivesoftware/Spark.java
index 4ad19c75..31804201 100644
--- a/src/java/org/jivesoftware/Spark.java
+++ b/src/java/org/jivesoftware/Spark.java
@@ -37,8 +37,6 @@ import java.io.IOException;
  */
 public final class Spark {
 
-    private static final String USER_HOME = System.getProperties().getProperty("user.home");
-
     private static final String USER_SPARK_HOME = System.getProperties().getProperty("user.home") + "/" + getUserConf();
 
     public static String ARGUMENTS;
@@ -285,30 +283,25 @@ public final class Spark {
      *
      * @return Directory name depending on Operating System.
      */
-    public static String getUserConf() {
+    private static String getUserConf() {
         if (isLinux()) {
             return ".Spark";
         }
+        else if(isWindows()){
+            return "Spark";
+        }
+        
         return "Spark";
     }
 
-    /**
-     * Returns the User specific directory for this Spark instance. The user home is where all user specific
-     * files are placed.
-     *
-     * @return the user home;
-     */
-    public static String getUserHome() {
-        return USER_HOME;
-    }
-
+   
     /**
      * Returns the Spark directory for the current user (user.home). The user home is where all user specific
      * files are placed to run Spark within a multi-user system.
      *
      * @return the user home / Spark;
      */
-    public static String getUserSparkHome() {
+    public static String getSparkUserHome() {
         return USER_SPARK_HOME;
     }
 
diff --git a/src/java/org/jivesoftware/spark/SparkManager.java b/src/java/org/jivesoftware/spark/SparkManager.java
index 4c874a6a..6638669c 100644
--- a/src/java/org/jivesoftware/spark/SparkManager.java
+++ b/src/java/org/jivesoftware/spark/SparkManager.java
@@ -351,7 +351,7 @@ public final class SparkManager {
      */
     public static File getUserDirectory() {
         final String bareJID = sessionManager.getBareAddress();
-        File userDirectory = new File(Spark.getUserSparkHome(), "/user/" + bareJID);
+        File userDirectory = new File(Spark.getSparkUserHome(), "/user/" + bareJID);
         if (!userDirectory.exists()) {
             userDirectory.mkdirs();
         }
diff --git a/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java b/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
index 774bd05d..6d09a723 100644
--- a/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
+++ b/src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
@@ -694,7 +694,7 @@ public class SparkTransferManager {
      * @param room  the ChatRoom of the user you wish to send the image to.
      */
     public void sendImage(final BufferedImage image, final ChatRoom room) {
-        File tmpDirectory = new File(Spark.getUserSparkHome(), "/tempImages");
+        File tmpDirectory = new File(Spark.getSparkUserHome(), "/tempImages");
         tmpDirectory.mkdirs();
 
         String imageName = "image_" + StringUtils.randomString(2) + ".png";
diff --git a/src/java/org/jivesoftware/spark/ui/ContactList.java b/src/java/org/jivesoftware/spark/ui/ContactList.java
index 717fd6ab..05f31e84 100644
--- a/src/java/org/jivesoftware/spark/ui/ContactList.java
+++ b/src/java/org/jivesoftware/spark/ui/ContactList.java
@@ -196,7 +196,7 @@ public final class ContactList extends JPanel implements ActionListener, Contact
         // Load Properties file
         props = new Properties();
         // Save to properties file.
-        propertiesFile = new File(Spark.getUserSparkHome() + "/groups.properties");
+        propertiesFile = new File(Spark.getSparkUserHome() + "/groups.properties");
         try {
             props.load(new FileInputStream(propertiesFile));
         }
diff --git a/src/java/org/jivesoftware/spark/ui/TranscriptWindow.java b/src/java/org/jivesoftware/spark/ui/TranscriptWindow.java
index cf6a8811..845e2e34 100644
--- a/src/java/org/jivesoftware/spark/ui/TranscriptWindow.java
+++ b/src/java/org/jivesoftware/spark/ui/TranscriptWindow.java
@@ -430,7 +430,7 @@ public class TranscriptWindow extends ChatArea {
         try {
             SimpleDateFormat formatter;
 
-            File defaultSaveFile = new File(Spark.getUserSparkHome() + "/" + fileName);
+            File defaultSaveFile = new File(Spark.getSparkUserHome() + "/" + fileName);
             final JFileChooser fileChooser = new JFileChooser(defaultSaveFile);
             fileChooser.setSelectedFile(defaultSaveFile);
 
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveMessage.java b/src/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveMessage.java
index d8014298..e0037d49 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveMessage.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/filetransfer/transfer/ui/ReceiveMessage.java
@@ -144,7 +144,7 @@ public class ReceiveMessage extends JPanel {
 
         titleLabel.setText(Res.getString("message.user.is.sending.you.a.file", contactItem.getNickname()));
 
-        File tempFile = new File(Spark.getUserSparkHome(), "/tmp");
+        File tempFile = new File(Spark.getSparkUserHome(), "/tmp");
         try {
             tempFile.mkdirs();
 
diff --git a/src/java/org/jivesoftware/sparkimpl/plugin/layout/LayoutSettingsManager.java b/src/java/org/jivesoftware/sparkimpl/plugin/layout/LayoutSettingsManager.java
index 66e6f5a6..d10d9976 100644
--- a/src/java/org/jivesoftware/sparkimpl/plugin/layout/LayoutSettingsManager.java
+++ b/src/java/org/jivesoftware/sparkimpl/plugin/layout/LayoutSettingsManager.java
@@ -98,7 +98,7 @@ public class LayoutSettingsManager {
      * @return the settings file.
      */
     public static File getSettingsFile() {
-        File file = new File(Spark.getUserSparkHome());
+        File file = new File(Spark.getSparkUserHome());
         if (!file.exists()) {
             file.mkdirs();
         }
diff --git a/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreference.java b/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreference.java
index 0d466f7e..519596dd 100644
--- a/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreference.java
+++ b/src/java/org/jivesoftware/sparkimpl/preference/sounds/SoundPreference.java
@@ -333,7 +333,7 @@ public class SoundPreference implements Preference {
     }
 
     private File getSoundSettingsFile() {
-        File file = new File(Spark.getUserSparkHome());
+        File file = new File(Spark.getSparkUserHome());
         if (!file.exists()) {
             file.mkdirs();
         }
diff --git a/src/java/org/jivesoftware/sparkimpl/settings/local/SettingsManager.java b/src/java/org/jivesoftware/sparkimpl/settings/local/SettingsManager.java
index ba5535e2..77ff197b 100644
--- a/src/java/org/jivesoftware/sparkimpl/settings/local/SettingsManager.java
+++ b/src/java/org/jivesoftware/sparkimpl/settings/local/SettingsManager.java
@@ -85,7 +85,7 @@ public class SettingsManager {
      * @return the settings file.
      */
     public static File getSettingsFile() {
-        File file = new File(Spark.getUserSparkHome());
+        File file = new File(Spark.getSparkUserHome());
         if (!file.exists()) {
             file.mkdirs();
         }