diff --git a/module/doc/js/setdocbasic.ui.js b/module/doc/js/setdocbasic.ui.js
index 2719bc1913..2bfd788efe 100644
--- a/module/doc/js/setdocbasic.ui.js
+++ b/module/doc/js/setdocbasic.ui.js
@@ -2,8 +2,9 @@ window.loadExecutions = function(e)
 {
     const officeTypes      = $('#setDocBasicForm').data('officeTypes');
     const docType          = $('#setDocBasicForm').data('docType');
-    const projectElement   = officeTypes.includes(docType) ? '.projectBox input[name="project"]': '#setDocBasicForm input[name="project"]';
-    const executionElement = officeTypes.includes(docType) ? '.executionBox input[name="execution"]': '#setDocBasicForm input[name="execution"]';
+    const isOfficeType     = officeTypes.includes(docType);
+    const projectElement   = isOfficeType ? '.projectBox input[name="project"]': '#setDocBasicForm input[name="project"]';
+    const executionElement = isOfficeType ? '.executionBox input[name="execution"]': '#setDocBasicForm input[name="execution"]';
     const projectID        = $(projectElement).val();
     if($(executionElement))
     {
@@ -20,7 +21,6 @@ window.loadExecutions = function(e)
     const link = $.createLink('doc', 'ajaxGetModules', 'objectType=project&objectID=' + projectID + '&type=doc');
     $.getJSON(link, function(data)
     {
-        const isOfficeType = officeTypes.includes(docType);
         const $libPicker = $(`${isOfficeType ? '' : '#setDocBasicForm'} [name='lib']`).zui('picker');
         $libPicker.render({items: data.libs});
         $libPicker.$.setValue('');
diff --git a/module/doc/ui/setdocbasic.html.php b/module/doc/ui/setdocbasic.html.php
index 59c27cfd29..e9b1577294 100644
--- a/module/doc/ui/setdocbasic.html.php
+++ b/module/doc/ui/setdocbasic.html.php
@@ -14,7 +14,7 @@ formPanel
 (
     setID('setDocBasicForm'),
     setData('officeTypes', $this->config->doc->officeTypes),
-    setData('docType', isset($doc) ? $doc->users : 'undefined'),
+    setData('docType', isset($doc) ? $doc->type : 'undefined'),
     set::title($title),
     set::submitBtnText($isDraft ? $lang->doc->saveDraft : (empty($docID) ? $lang->doc->release : $lang->save)),
     on::change('[name=space],[name=product],[name=execution]')->call('loadObjectModules', jsRaw('event')),