diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index 7839fb9252d5c2554cbd06cd8fbaed3e81939ba6..d63078b87c1ce676c9ccbb992c52843242c9e103 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -50,6 +50,43 @@ function ServerFacade(openbisServer) {
 	
 	this.openbisServer.setResponseInterceptor(responseInterceptor);
 	
+	//
+	// Display Settings
+	//
+	this.getSetting = function(keyOrNull, callback) {
+		mainController.serverFacade.openbisServer.getWebAppSettings("ELN-LIMS", function(response) {
+			var settings = response.result.settings;
+			if(!settings) {
+				settings = {};
+			}
+			if(keyOrNull) {
+				callback(settings[keyOrNull]);
+			} else {
+				callback(settings);
+			}
+		});
+	}
+	
+	this.setSetting = function(key, value) {
+		var _this = this;
+		var webAppId = "ELN-LIMS";
+		this.openbisServer.getWebAppSettings(webAppId, function(response) {
+			var settings = response.result.settings;
+			if(!settings) {
+				settings = {};
+			}
+			settings[key] = value;
+			
+			var webAppSettings = {
+					"@type" : "WebAppSettings",
+					"webAppId" : webAppId,
+					"settings" : settings
+			}
+			
+			_this.openbisServer.setWebAppSettings(webAppSettings, function(result) {});
+		});
+	}
+	
 	//
 	// Login Related Functions
 	//
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
index 2121dc937aec496255bd336a5c1e88300d2f6215..500d79e9413ac773cbb0549315ac744c51329690 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
@@ -24,7 +24,10 @@ function DataSetFormController(parentController, mode, sample, dataSet, isMini)
 		mainController.serverFacade.listDataSetTypes(
 				function(data) {
 					_this._dataSetFormModel.dataSetTypes = data.result;
-					_this._dataSetFormView.repaint($container);
+					mainController.serverFacade.getSetting("DataSetFormModel.isAutoUpload", function(value) {
+						_this._dataSetFormModel.isAutoUpload = (value === "true");
+						_this._dataSetFormView.repaint($container);
+					});
 				}
 		);
 	}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
index 9ef7af584574f6ce0f7e8ddd5a4ba648886a675d..06ec0f750f4909da42508b0f6a9b1791405cbcc5 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormView.js
@@ -199,6 +199,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 					$autoUploadCheck.change(function(){
 						var isChecked = $($(this).children()[0]).children()[0].checked;
 						_this._dataSetFormModel.isAutoUpload = isChecked;
+						mainController.serverFacade.setSetting("DataSetFormModel.isAutoUpload", isChecked);
 					});
 					
 				var $autoUploadGroup = $('<fieldset>')