diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/MainController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/MainController.js
index bcfbbb1358fceaa759f7f85527929d3180522bca..63565b42ba318015c2629411ae57ce7e4d4d8245 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/MainController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/MainController.js
@@ -31,7 +31,8 @@ $(document).ready(function() {
 	}
 	
 	$('#login-form').submit(function() {
-		 openbisServer.login( $.trim($('#username').val()), $.trim($('#password').val()), function(data) { enterApp(data) })
+		Util.blockUI();
+		openbisServer.login( $.trim($('#username').val()), $.trim($('#password').val()), function(data) { enterApp(data) })
 	});
 	
 	openbisServer.ifRestoredSessionActive(function(data) { enterApp(data) });
@@ -64,8 +65,6 @@ function enterApp(data) {
 	profile.skeuomorphism = false;
 	$('body').css('background-image', 'none');
 	$('body').css('background-repeat', 'none');
-	
-	Util.blockUI();
 	$("#login-form-div").hide();
 	$("#main").show();
 	
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleTable.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleTable.js
index bd6a20210384d0d0a796e3fe10e8ae3e481e076f..5aa621fd5dfc4936421051674a63421f6c42e6d1 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleTable.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleTable.js
@@ -215,7 +215,11 @@ function SampleTable(sampleTableId, profile, sampleTypeCode,inspectEnabled, enab
 									var propertyValue = d[propertyName];
 									if (propertyValue && searchRegexp.test(propertyValue)) {
 										if(propertyValue.indexOf("<root>") != -1) {
-											return Util.getHTMLTableFromXML(propertyValue);
+											if(profile.getHTMLTableFromXML) {
+												return profile.getHTMLTableFromXML(propertyValue);
+											} else {
+												return propertyValue;
+											}
 										} else {
 											return propertyValue;
 										}