diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
index 704159618d896de8c1d1aef028293934b1ad714a..4170b8c12333181c367eb4d843c5a8989cdefea0 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm.js
@@ -513,7 +513,7 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
 				var propertyTypeGroup = sampleType.propertyTypeGroups[i];
 				component += "<div>";
 				
-				if(propertyTypeGroup.name) {
+				if((propertyTypeGroup.name !== null) && (propertyTypeGroup.name !== "")) {
 					component += "<legend>" + propertyTypeGroup.name + "</legend>";
 					var storagePropertyGroup = this.profile.getPropertyGroupFromStorage(propertyTypeGroup.name);
 					if(storagePropertyGroup) {
@@ -523,7 +523,9 @@ function SampleForm(serverFacade, inspector, containerId, profile, sampleTypeCod
 						this.storages.push(storage);
 						component += "<div id='" + containerId + "'></div>"; // When a storage is used, the storage needs a container
 					}
-				} else {
+				} else if(	(i === 0) || 
+							((i !== 0) && (sampleType.propertyTypeGroups[i-1].name !== null) && (sampleType.propertyTypeGroups[i-1].name !== ""))
+						){
 					component += "<legend> Metadata</legend>";
 				}