diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
index 8c6bfbcf1f2791f064a86b0aff88d215f6bd5568..0d4b8ec549c8d94057db403d8c760002cc8c62f7 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js
@@ -87,9 +87,29 @@ function MainController(profile) {
 	//
 	// Validates and enters the app
 	//
-	
+
 	this.enterApp = function(data, username, password) {
+	    var _this = this;
+	    if(data && !username && !password) {
+	        this.openbisV1.listDataStores(function(result) {
+	            if(result && result.error && result.error.message) {
+	                var callback = function() {Util.unblockUI();};
+	                Util.showUserError(result.error.message, callback);
+	            } else {
+	                _this.initApp(data, username, password);
+	            }
+	        });
+	    } else {
+	        this.initApp(data, username, password);
+	    }
+	}
+
+	this.initApp = function(data, username, password) {
 		var localReference = this;
+		//
+		// Check
+		//
+
 		//
 		// Check Credentials
 		//