diff --git a/dav_events/templates/dav_events/event_create/RegistrationForm.html b/dav_events/templates/dav_events/event_create/RegistrationForm.html
index 252fe5b..12d9318 100644
--- a/dav_events/templates/dav_events/event_create/RegistrationForm.html
+++ b/dav_events/templates/dav_events/event_create/RegistrationForm.html
@@ -2,6 +2,41 @@
 {% load i18n %}
 {% load bootstrap3 %}
 
+{% block head-additional %}
+<script type="text/javascript">
+    function add_no_registration_handler() {
+        var e = $("#id_no_registration");
+        if(e != null)
+            e.change(function(){ no_registration_handler(); });
+    }
+
+    function no_registration_handler() {
+        var e = $("#id_no_registration");
+        if(e != null)
+            checked = e.prop("checked");
+        else
+            checked = false;
+
+        // var elements = $("input[name=deadline]");
+        //* elements.prop("disabled", checked);
+
+        elements = $("input[name=deadline_other]");
+        elements.prop("disabled", checked);
+
+        elements = $("div[class~=registration_settings]");
+        if(checked)
+            elements.slideUp();
+        else
+            elements.slideDown();
+    }
+
+    $(document).ready(function(){
+        add_no_registration_handler();
+        no_registration_handler();
+    });
+</script>
+{% endblock head-additional %}
+
 {% block form-fields-visible %}
 <div class="row">
     <div class="col-sm-12">
@@ -16,22 +51,23 @@
         </div>
     </div>
 </div>
-<div class="row">&nbsp;</div>
 <div class="row">
     <div class="col-sm-12">
-        {% bootstrap_field form.deadline %}
+        <div class="row registration_settings">
+            <div class="col-sm-12">
+                {% bootstrap_field form.deadline %}
+            </div>
+        </div>
+        <div class="row registration_settings">
+            <div class="col-sm-12">
+                {% bootstrap_field form.deadline_other %}
+            </div>
+        </div>
     </div>
 </div>
-<div class="row">
-    <div class="col-sm-12">
-        {% bootstrap_field form.deadline_other %}
-    </div>
-</div>
-<div class="row">&nbsp;</div>
-<div class="row">
+<div class="row registration_settings">
     <div class="col-sm-12">
         {% bootstrap_field form.registration_howto %}
     </div>
 </div>
-<div class="row">&nbsp;</div>
 {% endblock form-fields-visible %}