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 446ca9753e..161a44e492 100644
--- a/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/calendar/AbstractCalendarWebScript.java
@@ -111,6 +111,16 @@ public abstract class AbstractCalendarWebScript extends DeclarativeWebScript
           return null;
        }
        
+       // todays date - ignore time as we want all of today
+       if (date.equalsIgnoreCase("NOW"))
+       {
+           Date ddate = new Date();
+           ddate.setHours(0);;
+           ddate.setMinutes(0);
+           ddate.setSeconds(0);
+           return ddate;
+       }
+       
        // Try as ISO8601
        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 082cff5da9..6e6936ddfc 100644
--- a/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/calendar/UserCalendarEntriesGet.java
@@ -123,8 +123,14 @@ public class UserCalendarEntriesGet extends AbstractCalendarWebScript
       }
       else
       {
-         // All their sites
-         sites = siteService.listSites(AuthenticationUtil.getRunAsUser());
+         // All their sites (with optional limit)
+         int max = 0;
+         String strMax = req.getParameter("size");
+         if (strMax != null && strMax.length() != 0)
+         {
+             max = Integer.parseInt(strMax);
+         }
+         sites = siteService.listSites(AuthenticationUtil.getRunAsUser(), max);
       }
       
       // We need to know the Site Names, and the NodeRefs of the calendar containers