diff --git a/daemon.py b/daemon.py
index 6de4235eb..b226289a5 100644
--- a/daemon.py
+++ b/daemon.py
@@ -185,6 +185,8 @@ from happening import removeCalendarEvent
 from bookmarks import bookmark
 from bookmarks import undoBookmark
 from petnames import setPetName
+from followingCalendar import addPersonToCalendar
+from followingCalendar import removePersonFromCalendar
 import os
 
 
@@ -7658,6 +7660,26 @@ class PubServer(BaseHTTPRequestHandler):
                                        callingDomain)
                 self.server.POSTbusy = False
                 return
+            if '&submitOnCalendar=' in optionsConfirmParams:
+                if fields.get('onCalendar'):
+                    if fields['onCalendar'] == 'on':
+                        addPersonToCalendar(self.server.baseDir,
+                                            chooserNickname,
+                                            self.server.domain,
+                                            optionsNickname,
+                                            optionsDomainFull)
+                    else:
+                        removePersonFromCalendar(self.server.baseDir,
+                                                 chooserNickname,
+                                                 self.server.domain,
+                                                 optionsNickname,
+                                                 optionsDomainFull)
+                self._redirect_headers(originPathStr + '/' +
+                                       self.server.defaultTimeline +
+                                       '?page='+str(pageNumber), cookie,
+                                       callingDomain)
+                self.server.POSTbusy = False
+                return
             if '&submitBlock=' in optionsConfirmParams:
                 if self.server.debug:
                     print('Adding block by ' + chooserNickname +