diff --git a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
index d7e799d20ac2c611ea42b2c66ad7aaed22914aa6..6b91f9a2afb53b502307fd209976d444ee32a0f1 100644
--- a/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
+++ b/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js
@@ -1,7 +1,12 @@
+import("system.logging");
 import("system.vars");
 import("system.neon");
 import("Entity_lib");
 import("Document_lib");
 
 var uploadValue = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.BINDATA"));
-neon.setFieldValue("$field.NAME", DocumentUtil.getFilenameFromUpload(uploadValue));
+
+if(!(vars.get("$field.NAME") != null && vars.get("$field.NAME") != ""))
+{
+    neon.setFieldValue("$field.NAME", DocumentUtil.getFilenameFromUpload(uploadValue));
+}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
index 39644110481186cb406160b4d8ec4358c0bcf456..a5e2e676ed60730d3dc5bf0b54aba0823c46d618 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
@@ -6,5 +6,6 @@ var bindata = DocumentUtil.getBindataFromUpload(vars.get("$field.BINDATA"));
 
 if(bindata != "")
 {
-    db.updateBinary(vars.get("$field.DOCUMENTTEMPLATEID"), "", bindata, DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA")), "", "", "_____SYSTEMALIAS");
+    var bId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+    db.updateBinary(bId, "", bindata, DocumentUtil.getFilenameFromUpload(vars.get("$field.BINDATA")), "", "", "_____SYSTEMALIAS");
 }
\ No newline at end of file
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 42a427e1fbcc6876fade9da1e0ad66885b4e373e..f83ccd509c55938f72056ba65d13d60c56ed048c 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -25,7 +25,7 @@
   <clientSearchOptimizedForSpeed v="true" />
   <clientSearchExcludeForIgnorecase v="true" />
   <compressMailrepository v="false" />
-  <blobHandlingMethod>PROCESS</blobHandlingMethod>
+  <blobHandlingMethod>DATABASE</blobHandlingMethod>
   <databaseAuditGetOldValueLobs v="false" />
   <indexsearchGlobalEnabled v="true" />
   <indexsearchFullIndexerEnabled v="true" />