diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index f414fdb50..eb5eed1aa 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -652,7 +652,7 @@ switch($command) {
 				if (!empty($_POST["name"]))
 					$name = $_POST["name"];
 				else
-					$name = basename($userfilename);
+					$name = utf8_basename($userfilename);
 
 				/* Check if name already exists in the folder */
 				if(!$settings->_enableDuplicateDocNames) {
@@ -721,7 +721,7 @@ switch($command) {
 
 				$filesize = SeedDMS_Core_File::fileSize($userfiletmp);
 				$res = $folder->addDocument($name, '', $expires, $user, '',
-																		array(), $userfiletmp, basename($userfilename),
+																		array(), $userfiletmp, utf8_basename($userfilename),
 																		$fileType, $userfiletype, 0,
 																		$reviewers, $approvers, 1,
 																		'', array(), array(), $workflow);
@@ -756,7 +756,7 @@ switch($command) {
 							if(isset($GLOBALS['SEEDDMS_HOOKS']['addDocument'])) {
 								foreach($GLOBALS['SEEDDMS_HOOKS']['addDocument'] as $hookObj) {
 									if (method_exists($hookObj, 'preIndexDocument')) {
-										$hookObj->preIndexDocument($document, $idoc);
+										$hookObj->preIndexDocument(null, $document, $idoc);
 									}
 								}
 							}