diff --git a/module/doc/control.php b/module/doc/control.php
index 46b0872f57..bb7a8988da 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -857,8 +857,8 @@ class doc extends control
                 return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control chosen' multiple"));
             }
             if($doclib->acl == 'open') return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control chosen' multiple"));
+            if($doclib->acl == 'default') return print(html::select('groups[]', $groups, $selectedGroup, "class='form-control chosen' multiple"));
             if($doclib->acl == 'private') echo 'private';
-            if($doclib->acl == 'default') echo 'default';
             return false;
         }
 
@@ -874,8 +874,8 @@ class doc extends control
                 return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control'"));
             }
             if($doclib->acl == 'open') return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control'"));
+            if($doclib->acl == 'default') return print(html::select('users[]', $users, $selectedUser, "multiple class='form-control'"));
             if($doclib->acl == 'private') echo 'private';
-            if($doclib->acl == 'default') echo 'default';
             return false;
         }
 
diff --git a/module/doc/js/create.js b/module/doc/js/create.js
index 011df5c0f7..1d541b9f9d 100644
--- a/module/doc/js/create.js
+++ b/module/doc/js/create.js
@@ -115,7 +115,7 @@ function loadWhitelist(libID)
     var userLink  = createLink('doc', 'ajaxGetWhitelist', 'libID=' + libID + '&acl=&control=user');
     $.post(groupLink, function(groups)
     {
-        if(!(groups == 'default' || groups == 'private'))
+        if(groups != 'private')
         {
           $('#groups').replaceWith(groups);
           $('#groups_chosen').remove();
@@ -125,31 +125,28 @@ function loadWhitelist(libID)
 
     $.post(userLink, function(users)
     {
-        if(users != 'default')
+        if(users == 'private')
         {
-            if(users == 'private')
+            $('#aclopen').parent('.radio-inline').addClass('hidden');
+            $('#aclcustom').parent('.radio-inline').addClass('hidden');
+            $('#whiteListBox').addClass('hidden');
+            $('#aclprivate').prop('checked', true);
+        }
+        else
+        {
+            $('#aclopen').parent('.radio-inline').removeClass('hidden');
+            $('#aclcustom').parent('.radio-inline').removeClass('hidden');
+
+            $('#users').replaceWith(users);
+            $('#users_chosen').remove();
+            $('#whiteListBox .picker').remove();
+            if($('#users option').length < maxCount)
             {
-                $('#aclopen').parent('.radio-inline').addClass('hidden');
-                $('#aclcustom').parent('.radio-inline').addClass('hidden');
-                $('#whiteListBox').addClass('hidden');
-                $('#aclprivate').prop('checked', true);
+              $('#users').chosen();
             }
             else
             {
-                $('#aclopen').parent('.radio-inline').removeClass('hidden');
-                $('#aclcustom').parent('.radio-inline').removeClass('hidden');
-
-                $('#users').replaceWith(users);
-                $('#users_chosen').remove();
-                $('#whiteListBox .picker').remove();
-                if($('#users option').length < maxCount)
-                {
-                  $('#users').chosen();
-                }
-                else
-                {
-                  $('#users').picker();
-                }
+              $('#users').picker();
             }
         }
     });
diff --git a/module/doc/js/edit.js b/module/doc/js/edit.js
index 2692326b91..3c833e2e9c 100644
--- a/module/doc/js/edit.js
+++ b/module/doc/js/edit.js
@@ -139,7 +139,7 @@ function loadWhitelist(libID)
     var userLink  = createLink('doc', 'ajaxGetWhitelist', 'libID=' + libID + '&acl=&control=user' + '&docID=' + docID);
     $.post(groupLink, function(groups)
     {
-        if(!(groups == 'default' || groups == 'private'))
+        if(groups != 'private')
         {
           $('#groups').replaceWith(groups);
           $('#groups_chosen').remove();
@@ -149,31 +149,28 @@ function loadWhitelist(libID)
 
     $.post(userLink, function(users)
     {
-        if(users != 'default')
+        if(users == 'private')
         {
-            if(users == 'private')
+            $('#aclopen').parent('.radio-inline').addClass('hidden');
+            $('#aclcustom').parent('.radio-inline').addClass('hidden');
+            $('#whiteListBox').addClass('hidden');
+            $('#aclprivate').prop('checked', true);
+        }
+        else
+        {
+            $('#aclopen').parent('.radio-inline').removeClass('hidden');
+            $('#aclcustom').parent('.radio-inline').removeClass('hidden');
+
+            $('#users').replaceWith(users);
+            $('#users_chosen').remove();
+            $('#whiteListBox .picker').remove();
+            if($('#users option').length < maxCount)
             {
-                $('#aclopen').parent('.radio-inline').addClass('hidden');
-                $('#aclcustom').parent('.radio-inline').addClass('hidden');
-                $('#whiteListBox').addClass('hidden');
-                $('#aclprivate').prop('checked', true);
+              $('#users').chosen();
             }
             else
             {
-                $('#aclopen').parent('.radio-inline').removeClass('hidden');
-                $('#aclcustom').parent('.radio-inline').removeClass('hidden');
-
-                $('#users').replaceWith(users);
-                $('#users_chosen').remove();
-                $('#whiteListBox .picker').remove();
-                if($('#users option').length < maxCount)
-                {
-                  $('#users').chosen();
-                }
-                else
-                {
-                  $('#users').picker();
-                }
+              $('#users').picker();
             }
         }
     });
diff --git a/module/doc/view/create.html.php b/module/doc/view/create.html.php
index 0c72c691aa..ddb87bf0b3 100644
--- a/module/doc/view/create.html.php
+++ b/module/doc/view/create.html.php
@@ -108,8 +108,9 @@ $("a[href^='###']").click(function()
           <tr>
             <th><?php echo $lang->doclib->control;?></th>
             <td colspan='2'>
-              <?php echo html::radio('acl', $lang->doc->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"doc\")'");?>
-              <span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['doc'][$lib->acl];?></span>
+              <?php $acl = $lib->acl == 'default' ? 'open' : $lib->acl;?>
+              <?php echo html::radio('acl', $lang->doc->aclList, $acl, "onchange='toggleAcl(this.value, \"doc\")'");?>
+              <span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['doc'][$acl];?></span>
             </td>
           </tr>
           <tr id='whiteListBox' class='hidden'>
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index bb1a1fa5d7..8c77b141bb 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -84,8 +84,9 @@
         <tr>
           <th><?php echo $lang->doclib->control;?></th>
           <td colspan='2'>
-            <?php echo html::radio('acl', $lang->doc->aclList, $doc->acl, "onchange='toggleAcl(this.value, \"doc\")'")?>
-            <span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['doc'][$doc->acl];?></span>
+            <?php $acl = $lib->acl == 'default' ? 'open' : $lib->acl;?>
+            <?php echo html::radio('acl', $lang->doc->aclList, $acl, "onchange='toggleAcl(this.value, \"doc\")'")?>
+            <span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['doc'][$acl];?></span>
           </td>
         </tr>
         <tr id='whiteListBox' class='hidden'>