diff --git a/interface/web/js/xmpp_domain_registration.js b/interface/web/js/xmpp_domain_registration.js
index 3794bef9b49c1430e3acf7864d4fd287501d60a8..1ce239e8c66a675c75a11aa1cf3ab9e6ea1cd15c 100644
--- a/interface/web/js/xmpp_domain_registration.js
+++ b/interface/web/js/xmpp_domain_registration.js
@@ -1,4 +1,6 @@
 $('document').ready(function(){
+    // Not needed as long as maildomain hook is not implemented
+    return;
     $('#management_method').on('select2-selecting', function(e){
         val = e.choice ? e.choice.id : e.target.selectedIndex;
         if(val == 0){
diff --git a/interface/web/mail/templates/xmpp_domain_edit.htm b/interface/web/mail/templates/xmpp_domain_edit.htm
index b6fff9b2c34514034d14cef2e1d9c91d53992a78..5c4e8d79a096fb594d574a7830479f0688139c0b 100644
--- a/interface/web/mail/templates/xmpp_domain_edit.htm
+++ b/interface/web/mail/templates/xmpp_domain_edit.htm
@@ -73,13 +73,16 @@
 
 
 
-
+<!--
+management by maildomain is currently not supported
 <div class="form-group">
     <label for="management_method" class="col-sm-3 control-label">{tmpl_var name='management_method_txt'}</label>
     <div class="col-sm-9"><select name="management_method" id="management_method" class="form-control">
         {tmpl_var name='management_method'}
     </select></div>
 </div>
+-->
+<input type="hidden" name="management_method" id="management_method" value="0" />
 
 <div id="toggle-management-normal" class="collapse">
     <!--
@@ -92,7 +95,7 @@
     </div-->
 </div>
         <input type="hidden" name="public_registration" id="public_registration" value="n" />
-<div id="toggle-registration-closed" class="collapse">
+<div id="toggle-registration-closed" class="collapse in">
     <div class="form-group">
         <label for="registration_url" class="col-sm-3 control-label">{tmpl_var name='registration_url_txt'}</label>
         <div class="col-sm-9">
diff --git a/interface/web/mail/xmpp_domain_edit.php b/interface/web/mail/xmpp_domain_edit.php
index ff1f8b8929aacaa81c10a552339b8ac8b4b1fc26..2844a2776a3ea153fc8c282aaca63ec57d9680a0 100644
--- a/interface/web/mail/xmpp_domain_edit.php
+++ b/interface/web/mail/xmpp_domain_edit.php
@@ -264,6 +264,8 @@ class page_action extends tform_actions {
 
         // Read management method
         if(isset($this->dataRecord["management_method"]))
+            // Set management method to 0 as long as the mailaccount hook is not implemented
+            $this->dataRecord["management_method"] = 0;
             switch($this->dataRecord["management_method"]){
                 case 0:
                     $this->dataRecord["management_method"] = 'normal';