diff --git a/.gitignore b/.gitignore
index e24fe67a13..b2a02e4b24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,6 @@ target
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 
 hs_err_pid*
+
+
+*/alf_data
\ No newline at end of file
diff --git a/repository/src/main/java/org/alfresco/repo/invitation/activiti/SendModeratedInviteDelegate.java b/repository/src/main/java/org/alfresco/repo/invitation/activiti/SendModeratedInviteDelegate.java
index 0eb78612be..add6dd7557 100644
--- a/repository/src/main/java/org/alfresco/repo/invitation/activiti/SendModeratedInviteDelegate.java
+++ b/repository/src/main/java/org/alfresco/repo/invitation/activiti/SendModeratedInviteDelegate.java
@@ -72,9 +72,9 @@ public class SendModeratedInviteDelegate extends AbstractInvitationDelegate
         Map<String, Object> variables = execution.getVariables();
         String clientName = (String) variables.get(WorkflowModelModeratedInvitation.wfVarClientName);
 
-        ClientAppConfig.ClientApp clientApp = clientAppConfig.getClient(clientName);
-        if(clientApp != null)
+        if(clientName != null && clientAppConfig.getClient(clientName) != null)
         {
+            ClientAppConfig.ClientApp clientApp = clientAppConfig.getClient(clientName);
             final String path = clientApp.getProperty("inviteModeratedTemplatePath");
             final String templatePath = emailHelper.getEmailTemplate(clientApp.getName(), path, EMAIL_TEMPLATE_REF);
             invitationService.sendModeratedInvitation(invitationId, templatePath, EMAIL_SUBJECT_KEY, variables);
diff --git a/repository/src/main/resources/alfresco/application-context-core.xml b/repository/src/main/resources/alfresco/application-context-core.xml
index 6973ae9e36..9b8352f6ef 100644
--- a/repository/src/main/resources/alfresco/application-context-core.xml
+++ b/repository/src/main/resources/alfresco/application-context-core.xml
@@ -47,7 +47,6 @@
     <import resource="classpath:alfresco/notification-services-context.xml"/>
     <import resource="classpath:alfresco/activities/activities-feed-context.xml" />
     <import resource="classpath:alfresco/tagging-services-context.xml"/>
-    <import resource="classpath:alfresco/invitation-service-context.xml"/>
     <import resource="classpath:alfresco/webdav-context.xml"/>
     <import resource="classpath*:alfresco/patch/*-context.xml" />
     <import resource="classpath*:alfresco/dbscripts/*-context.xml" />
diff --git a/repository/src/main/resources/alfresco/application-context-highlevel.xml b/repository/src/main/resources/alfresco/application-context-highlevel.xml
index ed32bbc0f3..4451a1523a 100644
--- a/repository/src/main/resources/alfresco/application-context-highlevel.xml
+++ b/repository/src/main/resources/alfresco/application-context-highlevel.xml
@@ -39,6 +39,7 @@
     <import resource="classpath*:alfresco/domain/*-context.xml" />
     <import resource="classpath*:alfresco/smartfolder-context.xml" />
     <import resource="classpath*:alfresco/reset-password-context.xml" />
+    <import resource="classpath:alfresco/invitation-service-context.xml"/>
     <import resource="classpath:alfresco/heartbeat/heartbeat-repo-collector-context.xml"/>
     <import resource="classpath*:alfresco/enterprise/heartbeat/heartbeat-enterprise-repo-collector-context.xml" />
     <import resource="classpath*:alfresco/deprecated-model-bootstrap-context.xml" />
diff --git a/repository/src/test/java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java b/repository/src/test/java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
index 135fe8c7e3..fefd75b809 100644
--- a/repository/src/test/java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
+++ b/repository/src/test/java/org/alfresco/repo/invitation/site/InviteModeratedSenderTest.java
@@ -44,6 +44,8 @@ import junit.framework.TestCase;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.action.executer.MailActionExecuter;
+import org.alfresco.repo.admin.SysAdminParams;
+import org.alfresco.repo.admin.SysAdminParamsImpl;
 import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.invitation.WorkflowModelModeratedInvitation;
 import org.alfresco.repo.invitation.activiti.SendModeratedInviteDelegate;
@@ -175,6 +177,7 @@ public class InviteModeratedSenderTest extends TestCase
         SearchService mockSearchService = mockSearchService();
         SiteService mockSiteService = mockSiteService();
         FileFolderService mockFileFolderService = mockFileFolderService();
+        SysAdminParams sysAdminParams = new SysAdminParamsImpl();
 
         ServiceRegistry services = mock(ServiceRegistry.class);
         when(services.getActionService()).thenReturn(mockActionService);
@@ -183,6 +186,7 @@ public class InviteModeratedSenderTest extends TestCase
         when(services.getSearchService()).thenReturn(mockSearchService);
         when(services.getSiteService()).thenReturn(mockSiteService);
         when(services.getFileFolderService()).thenReturn(mockFileFolderService);
+        when(services.getSysAdminParams()).thenReturn(sysAdminParams);
         return services;
     }