diff --git a/config/alfresco/activiti-context.xml b/config/alfresco/activiti-context.xml
index 0cada51dd5..78aea7b39c 100644
--- a/config/alfresco/activiti-context.xml
+++ b/config/alfresco/activiti-context.xml
@@ -2,10 +2,10 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	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.xsd
+    xmlns:tx="http://www.springframework.org/schema/tx"
+    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.xsd
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd 
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
                            http://www.springframework.org/schema/tx      http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
@@ -45,11 +45,11 @@
         <property name="databaseSchemaUpdate" value="none" />
         <property name="history" value="full" />
         
-        <!-- Job-executor will be enabled once has been SchemaAvailableEvent fired  -->
+        <!-- Job-executor will be enabled once the SchemaAvailableEvent has been fired -->
         <property name="jobExecutorActivate" value="false" />
 
-    <!-- Limit the visible beans in expressions -->
-    <property name="beans" ref="activitiBeanRegistry" />
+        <!-- Limit the visible beans in expressions -->
+        <property name="beans" ref="activitiBeanRegistry" />
     
         <property name="customTypes">
             <list>
@@ -190,7 +190,8 @@
         
     <!-- Starting job-executor, after SchemaAvailableEvent has been broadcasted -->
     <bean id="activitiEngineInitializer" class="org.alfresco.repo.workflow.activiti.ActivitiEngineInitializer">
-      <property name="processEngine" ref="activitiProcessEngine" />
+        <property name="processEngine" ref="activitiProcessEngine" />
+        <property name="workflowAdminService" ref="workflowAdminService" />
     </bean>
 
 </beans>
diff --git a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
index 52233a6eaf..88f03c41ed 100644
--- a/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
+++ b/source/java/org/alfresco/repo/domain/schema/SchemaBootstrap.java
@@ -1697,14 +1697,15 @@ public class SchemaBootstrap extends AbstractLifecycleBean
      *
      * @author Frederik Heremans
      */
-    public class UnclosableConnection implements Connection {
-
+    public class UnclosableConnection implements Connection 
+    {
         private Connection wrapped;
         
         public UnclosableConnection(Connection wrappedConnection)
         {
             this.wrapped = wrappedConnection;
         }
+        
         @Override
         public boolean isWrapperFor(Class<?> iface) throws SQLException
         {
@@ -2007,6 +2008,5 @@ public class SchemaBootstrap extends AbstractLifecycleBean
         {
             wrapped.setTypeMap(map);
         }
-        
     }
 }
diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiEngineInitializer.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiEngineInitializer.java
index a2fd8434d9..5a321fed47 100644
--- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiEngineInitializer.java
+++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiEngineInitializer.java
@@ -21,6 +21,7 @@ package org.alfresco.repo.workflow.activiti;
 import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.impl.ProcessEngineImpl;
 import org.alfresco.repo.domain.schema.SchemaAvailableEvent;
+import org.alfresco.service.cmr.workflow.WorkflowAdminService;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 
@@ -33,19 +34,26 @@ import org.springframework.context.ApplicationListener;
 public class ActivitiEngineInitializer implements ApplicationListener<ApplicationEvent>
 {
     private ProcessEngine processEngine;
-    
-    @Override
-    public void onApplicationEvent(ApplicationEvent event)
-    {
-        if(event instanceof SchemaAvailableEvent && processEngine instanceof ProcessEngineImpl) 
-        {
-            // Start the job-executor
-            ((ProcessEngineImpl)processEngine).getProcessEngineConfiguration().getJobExecutor().start();
-        }
-    }
+    private WorkflowAdminService workflowAdminService;
     
     public void setProcessEngine(ProcessEngine processEngine)
     {
         this.processEngine = processEngine;
     }
+    
+    public void setWorkflowAdminService(WorkflowAdminService workflowAdminService)
+    {
+        this.workflowAdminService = workflowAdminService;
+    }
+    
+    @Override
+    public void onApplicationEvent(ApplicationEvent event)
+    {
+        if (event instanceof SchemaAvailableEvent && processEngine instanceof ProcessEngineImpl &&
+            workflowAdminService.isEngineEnabled(ActivitiConstants.ENGINE_ID)) 
+        {
+            // Start the job-executor
+            ((ProcessEngineImpl)processEngine).getProcessEngineConfiguration().getJobExecutor().start();
+        }
+    }
 }