diff --git a/lib/sc-launcher.jar b/lib/sc-launcher.jar
index 7b6d0ca46..6c32e4077 100644
Binary files a/lib/sc-launcher.jar and b/lib/sc-launcher.jar differ
diff --git a/resources/install/build.xml b/resources/install/build.xml
index 37e14a926..1c5e58eba 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -354,7 +354,7 @@
             value="org.osgi.framework.system.packages= com.growl;"/>
       <replaceregexp file="${macosx.resrc.dir}/felix.client.run.properties"
                 match="^felix.cache.profiledir=\$\{user.home\}/.sip-communicator/sip-communicator.bin"
-                replace="felix.cache.profiledir=${user.home}/Library/Application Support/${application.name}/sip-communicator.bin"
+                replace="felix.cache.profiledir=$\{user.home\}/Library/Application Support/${application.name}/sip-communicator.bin"
                 flags="m"/>
       <echo file="${macosx.resrc.dir}/felix.client.run.properties"
             append="true">felix.auto.start.70= reference:file:sc-bundles/growlnotification.jar
@@ -402,8 +402,6 @@
         <javaproperty name="java.library.path"
                       value="$JAVAROOT/lib/native/mac:${system.DYLD_LIBRARY_PATH}"/>
 
-        <javaproperty name="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
-                      value="${user.home}/Library/Application Support"/>
         <javaproperty name="net.java.sip.communicator.SC_HOME_DIR_NAME"
                       value="${application.name}"/>
 
diff --git a/src/net/java/sip/communicator/launcher/SIPCommunicator.java b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
index 3dc2f7112..25115125e 100644
--- a/src/net/java/sip/communicator/launcher/SIPCommunicator.java
+++ b/src/net/java/sip/communicator/launcher/SIPCommunicator.java
@@ -33,7 +33,8 @@ public static void main(String[] args)
         /**
          * Check whether default config folder exists.
          * If it exists we use it. Otherwise use the settings coming 
-         * from system properties. 
+         * from system properties. And set SC_HOME_DIR_LOCATION 
+         * as we cannot set it when building dmg packet.
          * This is done cause moving the config folder and preventing
          * not using existing data for users already using default folder. 
          */
@@ -53,6 +54,12 @@ public static void main(String[] args)
                 System.setProperty("net.java.sip.communicator.SC_HOME_DIR_NAME", 
                         scDefultDirName);
             }
+            else
+            {
+                System.setProperty("net.java.sip.communicator.SC_HOME_DIR_LOCATION", 
+                        System.getProperty("user.home") + File.separator +
+                        "Library" + File.separator + "Application Support");
+            }
         }
         
         if (version.startsWith("1.4") || vmVendor.startsWith("Gnu"))