diff --git a/source/java/org/alfresco/repo/web/scripts/invite/InviteHelper.java b/source/java/org/alfresco/repo/web/scripts/invite/InviteHelper.java
index 355c3fca49..0b16930d88 100644
--- a/source/java/org/alfresco/repo/web/scripts/invite/InviteHelper.java
+++ b/source/java/org/alfresco/repo/web/scripts/invite/InviteHelper.java
@@ -29,9 +29,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.repo.jscript.ScriptNode;
 import org.alfresco.repo.site.SiteInfo;
 import org.alfresco.repo.site.SiteService;
+import org.alfresco.repo.template.TemplateNode;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.security.PersonService;
@@ -156,18 +156,20 @@ public class InviteHelper
         
         // fetch the person node for the inviter
         NodeRef inviterRef = personService.getPerson(inviterUserNameProp);
-        ScriptNode inviterPerson = null;
+        TemplateNode inviterPerson = null;
         if (inviterRef != null)
         {
-            inviterPerson = new ScriptNode(inviterRef, serviceRegistry); 
+            inviterPerson = new TemplateNode(inviterRef, serviceRegistry, null); 
+            //inviterPerson = new ScriptNode(inviterRef, serviceRegistry); 
         }
         
         // fetch the person node for the invitee
         NodeRef inviteeRef = personService.getPerson(inviteeUserNameProp);
-        ScriptNode inviteePerson = null;
+        TemplateNode inviteePerson = null;
         if (inviteeRef != null)
         {
-            inviteePerson = new ScriptNode(inviteeRef, serviceRegistry); 
+        	inviteePerson = new TemplateNode(inviteeRef, serviceRegistry, null);
+            //inviteePerson = new ScriptNode(inviteeRef, serviceRegistry); 
         }
         
         // create and return a invite info
diff --git a/source/java/org/alfresco/repo/web/scripts/invite/InviteInfo.java b/source/java/org/alfresco/repo/web/scripts/invite/InviteInfo.java
index a06cee702c..fd518445de 100644
--- a/source/java/org/alfresco/repo/web/scripts/invite/InviteInfo.java
+++ b/source/java/org/alfresco/repo/web/scripts/invite/InviteInfo.java
@@ -24,9 +24,10 @@
  */
 package org.alfresco.repo.web.scripts.invite;
 
+import java.io.Serializable;
 import java.util.Date;
 
-import org.alfresco.repo.jscript.ScriptNode;
+import org.alfresco.repo.template.TemplateNode;
 import org.alfresco.repo.site.SiteInfo;
 
 /**
@@ -35,8 +36,10 @@ import org.alfresco.repo.site.SiteInfo;
  * 
  * @author glen dot johnson at alfresco dot com
  */
-public class InviteInfo
+public class InviteInfo implements Serializable
 {
+	private static final long serialVersionUID = -4514253998906200208L;
+	
     // invitation statuses
     public static final String INVITATION_STATUS_PENDING = "pending";
     public static final String INVITATION_STATUS_ACCEPTED = "accepted";
@@ -45,17 +48,17 @@ public class InviteInfo
     // private instances to hold property values
 	private String invitationStatus;
     private String inviterUserName;
-    private ScriptNode inviterPerson;
+    private TemplateNode inviterPerson;
     private String inviteeUserName;
-    private ScriptNode inviteePerson;
+    private TemplateNode inviteePerson;
     private String role;
     private String siteShortName;
     private SiteInfo siteInfo;
     private Date sentInviteDate;
     private String inviteId;
     
-    public InviteInfo(String invitationStatus, String inviterUserName, ScriptNode inviterPerson,
-    		String inviteeUserName, ScriptNode inviteePerson, String role,
+    public InviteInfo(String invitationStatus, String inviterUserName, TemplateNode inviterPerson,
+    		String inviteeUserName, TemplateNode inviteePerson, String role,
     		String siteShortName, SiteInfo siteInfo, Date sentInviteDate, String inviteId)
     {
     	this.invitationStatus = invitationStatus;
@@ -115,7 +118,7 @@ public class InviteInfo
 	 * 
 	 * @return the invitee person
 	 */
-    public ScriptNode getInviteePerson()
+    public TemplateNode getInviteePerson()
 	{
 		return inviteePerson;
 	}
@@ -125,7 +128,7 @@ public class InviteInfo
 	 * 
 	 * @return the inviter person
 	 */
-    public ScriptNode getInviterPerson()
+    public TemplateNode getInviterPerson()
 	{
 		return inviterPerson;
 	}
@@ -160,7 +163,8 @@ public class InviteInfo
 		return role;
 	}
 
-    public SiteInfo getSiteInfo() {
+    public SiteInfo getSiteInfo()
+    {
         return siteInfo;
     }