diff --git a/module/doc/config/form.php b/module/doc/config/form.php
index c9fc7ba915..41ae672d29 100644
--- a/module/doc/config/form.php
+++ b/module/doc/config/form.php
@@ -67,27 +67,28 @@ $config->doc->form->create['isDeliverable'] = array('type' => 'string',   'requi
 $config->doc->form->createtemplate = $config->doc->form->create;
 $config->doc->form->createtemplate['templateDesc'] = array('type' => 'string', 'required' => false, 'default' => '');
 
-$config->doc->form->edit['title']      = array('type' => 'string',   'required' => true,  'default' => '', 'filter' => 'trim');
-$config->doc->form->edit['product']    = array('type' => 'int',      'required' => false, 'default' => 0);
-$config->doc->form->edit['project']    = array('type' => 'int',      'required' => false, 'default' => 0);
-$config->doc->form->edit['execution']  = array('type' => 'int',      'required' => false, 'default' => 0);
-$config->doc->form->edit['module']     = array('type' => 'string',   'required' => false, 'default' => '');
-$config->doc->form->edit['lib']        = array('type' => 'int',      'required' => false, 'default' => 0, 'skipRequired' => true);
-$config->doc->form->edit['status']     = array('type' => 'string',   'required' => false, 'default' => 'normal');
-$config->doc->form->edit['parent']     = array('type' => 'int',      'required' => false, 'default' => 0);
-$config->doc->form->edit['type']       = array('type' => 'string',   'required' => false, 'default' => '');
-$config->doc->form->edit['keywords']   = array('type' => 'string',   'required' => false, 'default' => '', 'skipRequired' => true);
-$config->doc->form->edit['acl']        = array('type' => 'string',   'required' => false, 'default' => '');
-$config->doc->form->edit['contentType']= array('type' => 'string',   'required' => false, 'default' => 'doc');
-$config->doc->form->edit['content']    = array('type' => 'string',   'required' => false, 'default' => '', 'control' => 'editor', 'skipRequired' => true);
-$config->doc->form->edit['rawContent'] = array('type' => 'string',   'required' => false, 'default' => '', 'skipRequired' => true, 'specialchars' => 'no');
-$config->doc->form->edit['groups']     = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
-$config->doc->form->edit['users']      = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
-$config->doc->form->edit['readGroups'] = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
-$config->doc->form->edit['readUsers']  = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
-$config->doc->form->edit['mailto']     = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
-$config->doc->form->edit['editedBy']   = array('type' => 'string',   'required' => false, 'default' => '');
-$config->doc->form->edit['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
+$config->doc->form->edit['title']         = array('type' => 'string',   'required' => true,  'default' => '', 'filter' => 'trim');
+$config->doc->form->edit['product']       = array('type' => 'int',      'required' => false, 'default' => 0);
+$config->doc->form->edit['project']       = array('type' => 'int',      'required' => false, 'default' => 0);
+$config->doc->form->edit['execution']     = array('type' => 'int',      'required' => false, 'default' => 0);
+$config->doc->form->edit['module']        = array('type' => 'string',   'required' => false, 'default' => '');
+$config->doc->form->edit['lib']           = array('type' => 'int',      'required' => false, 'default' => 0, 'skipRequired' => true);
+$config->doc->form->edit['status']        = array('type' => 'string',   'required' => false, 'default' => 'normal');
+$config->doc->form->edit['parent']        = array('type' => 'int',      'required' => false, 'default' => 0);
+$config->doc->form->edit['type']          = array('type' => 'string',   'required' => false, 'default' => '');
+$config->doc->form->edit['keywords']      = array('type' => 'string',   'required' => false, 'default' => '', 'skipRequired' => true);
+$config->doc->form->edit['acl']           = array('type' => 'string',   'required' => false, 'default' => '');
+$config->doc->form->edit['contentType']   = array('type' => 'string',   'required' => false, 'default' => 'doc');
+$config->doc->form->edit['content']       = array('type' => 'string',   'required' => false, 'default' => '', 'control' => 'editor', 'skipRequired' => true);
+$config->doc->form->edit['rawContent']    = array('type' => 'string',   'required' => false, 'default' => '', 'skipRequired' => true, 'specialchars' => 'no');
+$config->doc->form->edit['groups']        = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
+$config->doc->form->edit['users']         = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
+$config->doc->form->edit['readGroups']    = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
+$config->doc->form->edit['readUsers']     = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
+$config->doc->form->edit['mailto']        = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
+$config->doc->form->edit['editedBy']      = array('type' => 'string',   'required' => false, 'default' => '');
+$config->doc->form->edit['editedDate']    = array('type' => 'datetime', 'required' => false, 'default' => $now);
+$config->doc->form->edit['isDeliverable'] = array('type' => 'string',   'required' => false, 'default' => 'no');
 
 $config->doc->form->edittemplate = $config->doc->form->edit;
 $config->doc->form->edittemplate['templateDesc'] = array('type' => 'string', 'required' => false, 'default' => '');
diff --git a/module/doc/js/setdocbasic.ui.js b/module/doc/js/setdocbasic.ui.js
index e57849e637..4800f3db9f 100644
--- a/module/doc/js/setdocbasic.ui.js
+++ b/module/doc/js/setdocbasic.ui.js
@@ -33,15 +33,17 @@ window.changeIsDeliverable = function()
 {
     if($(this).val() == 'yes')
     {
-        $('[name=acl]').attr('disabled', 'disabled');
-        $('[name=acl]').val('open');
-        $('[name=acl]').closest('.radio-primary').addClass('disabled');
-        $('[name=acl]').closest('.check-list').addClass('disabled');
+        $('[type=radio][name=acl]').attr('disabled', 'disabled');
+        $('#acl').removeAttr('disabled');
+        $("[type=radio][name='acl'][value='open']").prop('checked', true);
+        $('[type=radio][name=acl]').closest('.radio-primary').addClass('disabled');
+        $('[type=radio][name=acl]').closest('.check-list').addClass('disabled');
     }
     else
     {
-        $('[name=acl]').removeAttr('disabled');
-        $('[name=acl]').closest('.radio-primary').removeClass('disabled');
-        $('[name=acl]').closest('.check-list').removeClass('disabled');
+        $('#acl').attr('disabled', 'disabled');
+        $('[type=radio][name=acl]').removeAttr('disabled');
+        $('[type=radio][name=acl]').closest('.radio-primary').removeClass('disabled');
+        $('[type=radio][name=acl]').closest('.check-list').removeClass('disabled');
     }
 }
diff --git a/module/doc/ui/setdocbasic.template.html.php b/module/doc/ui/setdocbasic.template.html.php
index aa9fe073ba..61b77fb9d9 100644
--- a/module/doc/ui/setdocbasic.template.html.php
+++ b/module/doc/ui/setdocbasic.template.html.php
@@ -84,6 +84,7 @@ formPanel
             set::disabled($docID && $doc->isDeliverable == 'yes' ? true : false),
             set::items($lang->doc->aclListA),
             set::value(isset($doc) ? $doc->acl : 'open')
-        )
+        ),
+        input(setClass('hidden'), set::name('acl'), set::id('acl'), set::disabled($docID && $doc->isDeliverable == 'yes' ? false : true), set::value('open'))
     ) : null
 );