diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
index 2f9951fa3f..d8ca100815 100644
--- a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
@@ -262,7 +262,12 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
        
        // Parse the JSON, if supplied
        JSONObject json = null;
-       if(MimetypeMap.MIMETYPE_JSON.equals( req.getContentType() ))
+       String contentType = req.getContentType();
+       if(contentType != null && contentType.indexOf(';') != -1)
+       {
+          contentType = contentType.substring(0, contentType.indexOf(';'));
+       }
+       if(MimetypeMap.MIMETYPE_JSON.equals(contentType))
        {
           try
           {
diff --git a/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java b/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java
index 70ab493284..b88b944dcf 100644
--- a/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java
@@ -54,7 +54,7 @@ public class UserCalendarEntriesGet extends AbstractCalendarWebScript
       
       // Site is optional
       SiteInfo site = null;
-      String siteName = templateVars.get("siteid");
+      String siteName = templateVars.get("site");
       if(siteName != null)
       {
          site = siteService.getSite(siteName);