diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php
index c26b1a331..2b66b8af5 100644
--- a/views/bootstrap/class.AddDocument.php
+++ b/views/bootstrap/class.AddDocument.php
@@ -76,7 +76,7 @@ $(document).ready(function() {
 		}
 		return false;
 	}, "<?php printMLText("js_no_file");?>");
-	$("#form1").validate({
+	$("#adddocform").validate({
 		debug: false,
 		ignore: ":hidden:not(.do_validate)",
 		invalidHandler: function(e, validator) {
@@ -107,16 +107,16 @@ $(document).ready(function() {
 		if($enablelargefileupload) {
 ?>
 			'userfile-fine-uploader-uuids': {
-				fineuploader: [ userfileuploader, $('#dropfolderfileform1') ]
+				fineuploader: [ userfileuploader, $('#dropfolderfileadddocform') ]
 			}
 <?php
 		} else {
 ?>
 			'userfile[]': {
-				alternatives: [$('#dropfolderfileform1'), $('#choosedocsearchform1')]
+				alternatives: [$('#dropfolderfileadddocform'), $('#choosedocsearchadddocform')]
 			},
-			dropfolderfileform1: {
-				 alternatives: [$("#userfile"), $('#choosedocsearchform1')]
+			dropfolderfileadddocform: {
+				 alternatives: [$("#userfile"), $('#choosedocsearchadddocform')]
 			}
 <?php
 		}
@@ -143,11 +143,11 @@ $(document).ready(function() {
 	});
 });
 <?php
-			$this->printKeywordChooserJs("form1");
+			$this->printKeywordChooserJs("adddocform");
 			if($libraryfolder)
-				$this->printDocumentChooserJs("form1");
+				$this->printDocumentChooserJs("adddocform");
 			if($dropfolderdir) {
-				$this->printDropFolderChooserJs("form1");
+				$this->printDropFolderChooserJs("adddocform");
 			}
 			$this->printFileChooserJs();
 	} /* }}} */
@@ -196,7 +196,7 @@ $(document).ready(function() {
 			echo $txt;
 		$this->contentContainerStart();
 ?>
-		<form class="form-horizontal" action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="form1" name="form1">
+		<form class="form-horizontal" action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="adddocform" name="adddocform">
 		<?php echo createHiddenFieldWithKey('adddocument'); ?>
 		<input type="hidden" name="folderid" value="<?php print $folderid; ?>">
 		<input type="hidden" name="showtree" value="<?php echo showtree();?>">
@@ -224,7 +224,7 @@ $(document).ready(function() {
 		);
 		$this->formField(
 			getMLText("keywords"),
-				$this->getKeywordChooserHtml('form1')
+				$this->getKeywordChooserHtml('adddocform')
 		);
 		$options = array();
 		$categories = $dms->getDocumentCategories();
@@ -326,13 +326,13 @@ $(document).ready(function() {
 		if($dropfolderdir) {
 			$this->formField(
 				getMLText("dropfolder_file"),
-				$this->getDropFolderChooserHtml("form1", $dropfolderfile)
+				$this->getDropFolderChooserHtml("adddocform", $dropfolderfile)
 			);
 		}
 		if($libraryfolder) {
 			$this->formField(
 				getMLText("librarydoc"),
-				$this->getDocumentChooserHtml("form1", M_READ, -1, null, 'librarydoc', $librarydoc, 1)
+				$this->getDocumentChooserHtml("adddocform", M_READ, -1, null, 'librarydoc', $libraryfolder, 1)
 			);
 		}
 		$this->formField(