diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index 65e530ae7..57162b071 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -325,6 +325,7 @@ $(document).ready(function() {
 		}
 
 		$this->contentSubHeading(getMLText("version_info"));
+		if(!$nodocumentformfields || !in_array('version', $nodocumentformfields)) {
 		$this->formField(
 			getMLText("version"),
 			array(
@@ -335,6 +336,7 @@ $(document).ready(function() {
 				'value'=>1
 			)
 		);
+		}
 		$this->formField(
 			getMLText("local_file"),
 			$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile[]', $enablemultiupload).($enablemultiupload ? '<a class="" id="new-file"><?php printMLtext("add_multiple_files") ?></a>' : '')
diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index 31f5810e0..3cf73e26f 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -288,7 +288,7 @@ $this->showStartPaneContent('site', (!$currenttab || $currenttab == 'site'));
       -->
 <?php $this->showConfigHeadline('settings_Edition'); ?>
 <?php $this->showConfigCheckbox('settings_strictFormCheck', 'strictFormCheck'); ?>
-<?php $this->showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version_comment', 'notification'), true, true); ?>
+<?php $this->showConfigOption('settings_noDocumentFormFields', 'noDocumentFormFields', array('comment', 'keywords', 'categories', 'sequence', 'expires', 'version', 'version_comment', 'notification'), true, true); ?>
 <?php $this->showConfigText('settings_viewOnlineFileTypes', 'viewOnlineFileTypes', 'array'); ?>
 <?php $this->showConfigText('settings_editOnlineFileTypes', 'editOnlineFileTypes', 'array'); ?>
 <?php $this->showConfigCheckbox('settings_enableConverting', 'enableConverting'); ?>