diff --git a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
index 359cdf7855..4a18661888 100644
--- a/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
+++ b/source/java/org/alfresco/repo/invitation/InvitationServiceImpl.java
@@ -653,6 +653,18 @@ public class InvitationServiceImpl implements InvitationService
 				boolean crap = false;
 				for(QName key : keys)
 				{
+					if(key.equals(WorkflowModelNominatedInvitation.WF_PROP_INVITEE_USER_NAME))
+					{
+						Object val1 = wfNominatedQueryProps.get(key);
+						Object val2 = ((NominatedInvitation)result).getInviteeUserName();
+						if (!val1.equals(val2))
+						{
+							// Uh oh ... crap detected
+							crap = true;
+							System.out.println("ALFCOM-2598 key:" + key + "query:" + val1 +  "task:" + val2);
+							break;
+						}
+					}
 					if(key.equals(WorkflowModelNominatedInvitation.WF_PROP_RESOURCE_NAME))
 					{
 						Object val1 = wfNominatedQueryProps.get(key);
diff --git a/source/java/org/alfresco/repo/site/script/Site.java b/source/java/org/alfresco/repo/site/script/Site.java
index ca0692063a..7b5992a173 100644
--- a/source/java/org/alfresco/repo/site/script/Site.java
+++ b/source/java/org/alfresco/repo/site/script/Site.java
@@ -704,7 +704,7 @@ public class Site implements Serializable
       	}
     	if (props.has("invitationType", props))
     	{
-    		String invitationType = (String)props.get("inviteeUserName", props);
+    		String invitationType = (String)props.get("invitationType", props);
     		crit.setInvitationType(InvitationType.valueOf(invitationType));
         }