diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js
index 172b577bcf..7d1fc93504 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/calendar/event.put.js
@@ -82,6 +82,20 @@ function main()
          event.properties[ propsmap[prop] ] = value;
 		}
    }
+   
+   if (!json.isNull("tags"))
+   {
+      var tags = String(json.get("tags")); // space delimited string
+      if (tags !== "") 
+      {
+         var tagsArray = tags.split(" ");
+         event.tags = tagsArray;
+      }
+      else
+      {
+         event.tags = []; // reset
+      }
+   }
 	
 	try 
 	{