diff --git a/config/alfresco/messages/invitation-service.properties b/config/alfresco/messages/invitation-service.properties
index 621f21d724..c35315f328 100644
--- a/config/alfresco/messages/invitation-service.properties
+++ b/config/alfresco/messages/invitation-service.properties
@@ -7,6 +7,7 @@ invitation.error.not_found="Invitation not found, invitationId: {0}"
 invitation.error.not_found_by_invitee="Invitation not found for site: {0}, invitee: {1}"
 invitation.error.invalid_inviteId_format="Invitation Id not valid format, valid formats are <engine>$<id> : {0}"
 invitation.invite.already_member="The user, {0} is already a member of {1} and cannot be invited again"
+invitation.invite.user_disabled="The user, {0} is disabled and cannot be invited"
 invitation.cancel.not_site_manager="Current user, {0}, cannot cancel invitation: {1} because they are not a Site Manager for site: {2}"
 invitation.invite.not_site_manager="Current user, {0}, is not a Site Manager for site: {1}"
 invitation.invite.unable_generate_id="Unable to generate a user name for invitee, which doesn''t already belong to someone else firstName:{0} lastName:{1} email:{2}"
diff --git a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
index 854f4ea77d..ca9bac1e1e 100644
--- a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
+++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Alfresco Software Limited.
+ * Copyright (C) 2005-2015 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -1340,6 +1340,18 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
 
             Object objs[] = { inviteeUserName, inviteeEmail, siteShortName };
             throw new InvitationExceptionUserError("invitation.invite.already_member", objs);
+        }   
+
+        /**
+         * throw exception if person is disabled
+         */
+        if (!personService.isEnabled(inviteeUserName))
+        {
+            if (logger.isDebugEnabled())
+                logger.debug("Failed - invitee user is disabled.");
+            
+            Object objs[] = { inviteeUserName, inviteeEmail, siteShortName };
+            throw new InvitationExceptionUserError("invitation.invite.user_disabled", objs);
         }
 
         //