diff --git a/CHANGELOG b/CHANGELOG
index a0cca4a8c..584a8f23c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,8 @@
                      Changes in version 5.0.5
 --------------------------------------------------------------------------------
 - merged changes from 4.3.28
+- fix choosing home folder of users
+- fix clearing cache
 
 --------------------------------------------------------------------------------
                      Changes in version 5.0.4
diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 8977230a8..edd9fed2c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -1173,22 +1173,22 @@ function folderSelected<?php echo $formName ?>(id, name) {
 <?php
 	} /* }}} */
 
-	function printFolderChooserJs($formName) { /* {{{ */
+	function printFolderChooserJs($form) { /* {{{ */
 ?>
-function folderSelected<?php echo $formName ?>(id, name) {
-	$('#targetid<?php echo $formName ?>').val(id);
-	$('#choosefoldersearch<?php echo $formName ?>').val(name);
-	$('#folderChooser<?php echo $formName ?>').modal('hide');
+function folderSelected<?php echo $form ?>(id, name) {
+	$('#targetid<?php echo $form ?>').val(id);
+	$('#choosefoldersearch<?php echo $form ?>').val(name);
+	$('#folderChooser<?php echo $form ?>').modal('hide');
 }
 <?php
 	} /* }}} */
 
-	function printFolderChooser($formName, $accessMode, $exclude = -1, $default = false) { /* {{{ */
-		$this->printFolderChooserHtml($formName, $accessMode, $exclude, $default);
+	function printFolderChooser($form, $accessMode, $exclude = -1, $default = false, $formname='') { /* {{{ */
+		$this->printFolderChooserHtml($form, $accessMode, $exclude, $default, $formname);
 ?>
 		<script language="JavaScript">
 <?php
-		$this->printFolderChooserJs($formName);
+		$this->printFolderChooserJs($form);
 ?>
 		</script>
 <?php