diff --git a/tabellio/config/controlpanel.pt b/tabellio/config/controlpanel.pt
index bd5027e..ccdd799 100644
--- a/tabellio/config/controlpanel.pt
+++ b/tabellio/config/controlpanel.pt
@@ -314,10 +314,69 @@
 
             </form>
 
+
+        <dt id="fieldsetlegend-misc">Misc settings</dt>
+        <dd id="fieldset-misc">
+
+            <form
+                name="misc"
+                method="post"
+                class="enableUnloadProtection"
+                tal:attributes="action request/URL"
+                tal:define="errors view/errors">
+
+                <div
+                    tal:define="error errors/ical_username | nothing;
+                                ical_username python:request.get('ical_username', view.settings.ical_username)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="ical_username" i18n:translate="label_ical_username">ICal Username</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="ical_username"
+                        id="ical_username"
+                        type="text"
+                        tal:attributes="value ical_username"
+                        />
+                </div>
+
+                <div
+                    tal:define="error errors/ical_password | nothing;
+                                ical_password python:request.get('ical_password', view.settings.ical_password)"
+                    tal:attributes="class python:'field error' if error else 'field'">
+
+                    <label for="ical_password" i18n:translate="label_ical_password">ICal Password</label>
+                    <div tal:content="error" tal:condition="error" />
+                    <input
+                        name="ical_password"
+                        id="ical_password"
+                        type="password"
+                        tal:attributes="value ical_password"
+                        />
+                </div>
+
+                <div class="formControls">
+                    <input
+                        type="submit"
+                        name="form.button.MiscSave"
+                        class="context"
+                        value="Save"
+                        i18n:attributes="value" />
+
+                    <input
+                        type="submit"
+                        name="form.button.Cancel"
+                        class="context"
+                        value="Cancel"
+                        i18n:attributes="value" />
+                </div>
+
+                <input tal:replace="structure context/@@authenticator/authenticator" />
+
+            </form>
+
         </dd>
 
-
-
         <dt id="fieldsetlegend-greffier">Greffier settings</dt>
         <dd id="fieldset-greffier">
 
diff --git a/tabellio/config/controlpanel.py b/tabellio/config/controlpanel.py
index 0c76996..1f6a880 100644
--- a/tabellio/config/controlpanel.py
+++ b/tabellio/config/controlpanel.py
@@ -86,6 +86,12 @@ class TabellioControlpanel(BrowserView):
             self.settings.greffier_phone = form.get('greffier_phone')
             self.settings.greffier_fax = form.get('greffier_fax')
 
+        if 'form.button.MiscSave' in form:
+            self.authorize()
+            submitted = True
+            self.settings.ical_username = form.get('ical_username')
+            self.settings.ical_password = form.get('ical_password')
+
         if submitted and not self.errors:
             self._setup()
             IStatusMessage(self.request).add(_(u"Changes saved"))
diff --git a/tabellio/config/interfaces.py b/tabellio/config/interfaces.py
index 958afea..47b9b05 100644
--- a/tabellio/config/interfaces.py
+++ b/tabellio/config/interfaces.py
@@ -61,3 +61,12 @@ class ITabellioSettings(Interface):
     greffier_address_line2 = schema.Text(title=_(u'Greffier Address Line 2'), required=False)
     greffier_phone = schema.Text(title=_(u'Greffier Phone'), required=False)
     greffier_fax = schema.Text(title=_(u'Greffier Fax'), required=False)
+
+    ical_username = schema.TextLine(
+        title=_('ical_username', 'ICal Username'),
+        required=False)
+
+    ical_password = schema.TextLine(
+        title=_('ical_password', 'ICal Password'),
+        required=False)
+