diff --git a/config/alfresco/application-context-core.xml b/config/alfresco/application-context-core.xml
index c350107e8c..ec272e3af7 100644
--- a/config/alfresco/application-context-core.xml
+++ b/config/alfresco/application-context-core.xml
@@ -13,6 +13,8 @@
     <import resource="classpath*:alfresco/extension/mt/mt-context.xml"/>
     <import resource="classpath:alfresco/encryption-context.xml" />
     <import resource="classpath*:alfresco/enterprise/jmx/jmx-context.xml" />
+    <import resource="classpath:alfresco/spring/*-context.xml" />
+    <import resource="classpath*:alfresco/enterprise/spring/*-context.xml" />
     <import resource="classpath:alfresco/core-services-context.xml" />
     <import resource="classpath:alfresco/copy-services-context.xml" />
     <import resource="classpath:alfresco/public-services-context.xml" />
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 9624c43f87..f8a9094c6a 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -4,8 +4,6 @@
 <!-- Core and miscellaneous bean definitions -->
 <beans>
 
- 
-
     <!--                    -->
     <!--  PERSISTENCE       -->
     <!--                    -->
@@ -129,6 +127,10 @@
         <property name="propertyDefaults">
             <ref local="global-properties" />
         </property>
+        
+        <property name="encryptedPropertyDefaults">
+            <ref bean="encrypted-properties" />
+        </property>
     </bean>
 
     <!--
diff --git a/config/alfresco/spring/encrypted-properties-context.xml b/config/alfresco/spring/encrypted-properties-context.xml
new file mode 100644
index 0000000000..96826b9c41
--- /dev/null
+++ b/config/alfresco/spring/encrypted-properties-context.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd">
+
+
+    <util:map id="encrypted-properties" >
+        <!-- A dummy value -->
+        <entry key="empty.enc" >
+            <value>empty</value>
+        </entry>
+    </util:map>
+
+</beans>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java b/source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
index 0201c9ca91..823db808c9 100644
--- a/source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
+++ b/source/java/org/alfresco/repo/management/subsystems/AbstractPropertyBackedBean.java
@@ -86,6 +86,9 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
 
     /** Property defaults provided by the installer or System properties. */
     private Properties propertyDefaults;
+    
+    /** Property defaults provided by the JASYPT decryptor. */
+    private Properties encryptedPropertyDefaults;
 
     /** Resolves placeholders in the property defaults. */
     private DefaultResolver defaultResolver = new DefaultResolver();
@@ -222,6 +225,12 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
     {
         this.propertyDefaults = propertyDefaults;
     }
+    
+    public void setEncryptedPropertyDefaults(Properties propertyDefaults)
+    {
+        this.encryptedPropertyDefaults = propertyDefaults;
+        
+    }
 
     /**
      * Gets the property defaults provided by the installer or System properties.
@@ -242,7 +251,25 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
      */
     protected String resolveDefault(String name)
     {
-        String value = this.propertyDefaults.getProperty(name);
+        Properties props = new Properties();
+        
+        if(propertyDefaults != null)
+        {
+            for( Object key : propertyDefaults.keySet())
+            {
+                props.setProperty((String)key, propertyDefaults.getProperty((String)key));
+            }
+        }
+        
+        if(encryptedPropertyDefaults != null)
+        {
+            for( Object key : encryptedPropertyDefaults.keySet())
+            {
+                props.setProperty((String)key, encryptedPropertyDefaults.getProperty((String)key));
+            }
+        }
+        
+        String value = props.getProperty(name);
         if (value != null)
         {
             value = this.defaultResolver.resolveValue(value);
@@ -1094,8 +1121,24 @@ public abstract class AbstractPropertyBackedBean implements PropertyBackedBean,
          */
         public String resolveValue(String val)
         {
-            return AbstractPropertyBackedBean.this.propertyDefaults == null ? null : replacePlaceholders(
-                    val, AbstractPropertyBackedBean.this.propertyDefaults);
+            Properties props = new Properties();
+            
+            if(propertyDefaults != null)
+            {
+                for( Object key : propertyDefaults.keySet())
+                {
+                    props.setProperty((String)key, propertyDefaults.getProperty((String)key));
+                }
+            }
+            
+            if(encryptedPropertyDefaults != null)
+            {
+                for( Object key : encryptedPropertyDefaults.keySet())
+                {
+                    props.setProperty((String)key, encryptedPropertyDefaults.getProperty((String)key));
+                }
+            }
+            return replacePlaceholders(val, props);
         }
 
     }