diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/log4j.properties b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/log4j.properties
index 7a14ca27f5..4ea7c2623a 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/log4j.properties
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/log4j.properties
@@ -55,4 +55,9 @@ log4j.logger.org.alfresco.module.org_alfresco_module_rm.patch=info
 #
 # Job debug
 #
-#log4j.logger.org.alfresco.module.org_alfresco_module_rm.job=debug
\ No newline at end of file
+#log4j.logger.org.alfresco.module.org_alfresco_module_rm.job=debug
+
+#
+# Module compatibility debug
+#
+log4j.logger.org.alfresco.module.org_alfresco_module_rm.bootstrap.ModuleCompatibilityComponent=debug
\ No newline at end of file
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
index c53b8475d4..50e505c39f 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/module-context.xml
@@ -10,7 +10,7 @@
        
    <!-- Module compatibility component -->
    <bean name="rm.moduleCompatibilityComponent" class="org.alfresco.module.org_alfresco_module_rm.bootstrap.ModuleCompatibilityComponent">
-      <property name="descriptorService" ref="DescriptorService"/>
+      <property name="descriptorService" ref="descriptorComponent"/>
       <property name="moduleService" ref="ModuleService"/>
    </bean>
 
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java
index d86a0cfb8a..4833a1b282 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/bootstrap/ModuleCompatibilityComponent.java
@@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.event.ContextStartedEvent;
+import org.springframework.context.event.ContextRefreshedEvent;
 
 /**
  * Module compatibility component.
@@ -37,7 +37,7 @@ import org.springframework.context.event.ContextStartedEvent;
  * @author Roy Wetherall
  * @since 2.4
  */
-public class ModuleCompatibilityComponent implements ApplicationListener<ContextStartedEvent>
+public class ModuleCompatibilityComponent implements ApplicationListener<ContextRefreshedEvent>
 {
 	/** Logger */
     private static Log logger = LogFactory.getLog(ModuleCompatibilityComponent.class);
@@ -71,28 +71,52 @@ public class ModuleCompatibilityComponent implements ApplicationListener<Context
 	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
 	 */
 	@Override
-	public void onApplicationEvent(ContextStartedEvent contextStartedEvent) 
+	public void onApplicationEvent(ContextRefreshedEvent contextRefreshedEvent) 
 	{
-		// get the license mode
-		LicenseMode licenseMode = descriptorService.getLicenseDescriptor().getLicenseMode();
+		// grab the application context
+		ApplicationContext applicationContext = contextRefreshedEvent.getApplicationContext();
 		
-		if (LicenseMode.ENTERPRISE.equals(licenseMode) &&
-			moduleService.getModule(RM_ENT_MODULE_ID) == null)
+		// get the license mode
+		LicenseMode licenseMode = descriptorService.getServerDescriptor().getLicenseMode();
+		
+		// determine whether RM Enterprise is installed or not
+		boolean isRMEnterprise = isRMEnterprise();
+		
+		// debug log
+		if (logger.isDebugEnabled())
+		{
+			logger.debug("Module compatibility information:");
+			logger.debug("   Repository licence mode = " + licenseMode.toString());
+			logger.debug("   RM Enterprise installed = " + isRMEnterprise);
+		}
+		
+		if (LicenseMode.ENTERPRISE.equals(licenseMode) && !isRMEnterprise)
 		{
 			// running enterprise rm on community core so close application context
-			closeApplicationContext(contextStartedEvent.getApplicationContext(), 
+			closeApplicationContext(
+					applicationContext, 
 					"Running Community Records Management Module on Enterprise Alfresco One is not a supported configuration.");
 			
 		}
-		else if (!LicenseMode.ENTERPRISE.equals(licenseMode) &&
-				 moduleService.getModule(RM_ENT_MODULE_ID) != null)
+		else if (!LicenseMode.ENTERPRISE.equals(licenseMode) && isRMEnterprise)
 		{
 			// running community rm on enterprise core so close application context
-			closeApplicationContext(contextStartedEvent.getApplicationContext(), 
+			closeApplicationContext(
+					applicationContext, 
 					"Running Enterprise Records Management module on Community Alfresco One is not a supported configuration.");
 		}
 	}
 	
+	/**
+	 * Indicates whether RM Enterprise module is installed or not.
+	 * 
+	 * @return	boolean	true if RM Enterprise is installed, false otherwise
+	 */
+	private boolean isRMEnterprise()
+	{
+		return (moduleService.getModule(RM_ENT_MODULE_ID) != null);
+	}
+	
 	/**
 	 * Close application context, logging message.
 	 *