diff --git a/webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_group.html b/webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_group.html
index 45d2d2cdb..02aacaf9f 100644
--- a/webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_group.html
+++ b/webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_group.html
@@ -22,7 +22,9 @@
 				</div>
 			</#if>
 			<fieldset class="<#if id_display??> display_field_${id_display} d-none</#if>" style="position:relative;">
-				<legend>${group.title} <#if indexIteration &gt; 0>(${indexIteration+1})</#if>
+				<#if !group.title?ends_with('hidden')>
+					<legend>${group.title} <#if indexIteration &gt; 0>(${indexIteration+1})</#if>
+				</#if>
 				<#if group.description!=''>
 					<div class="helpBox">${group.description}</div>
 				</#if>
diff --git a/webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_step.html b/webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_step.html
index 7a7c17e29..eb4d3414e 100644
--- a/webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_step.html
+++ b/webapp/WEB-INF/templates/skin/plugins/forms/composite_template/view_step.html
@@ -1,5 +1,7 @@
 <div class="card">
-    <h3 class="card-header">${step.title}</h3>
+	<#if !step.title?ends_with('hidden')>
+		<h3 class="card-header">${step.title}</h3>
+	</#if>
     <div id="step-content" class="card-body">
         ${stepContent}
         <#if display_captcha>${captcha}</#if>
diff --git a/webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/horizontal_breadcrumb.html b/webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/horizontal_breadcrumb.html
index be1682431..46eb07892 100644
--- a/webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/horizontal_breadcrumb.html
+++ b/webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/horizontal_breadcrumb.html
@@ -1,11 +1,12 @@
+
 <#if list_steps?has_content>
 	<nav id="horizontal-breadcrumb" aria-label="breadcrumb">
 	  <ol class="breadcrumb">
 	  	<#list list_steps as step>
 		  	<#if step?has_next>
-		  		<li class="breadcrumb-item"><button class="btn btn-link" name="action_doGoToStep" type="submit" value="${step?index}">${step.title}</button></li>
+		  		<li class="breadcrumb-item"><button class="btn btn-link" name="action_doGoToStep" type="submit" value="${step?index}">${step.title!?replace('- hidden','')}</button></li>
 		  	<#else>
-		  		<li class="breadcrumb-item active" aria-current="page">${step.title}</li>
+		  		<li class="breadcrumb-item active" aria-current="page">${step.title!?replace('- hidden','')}</li>
 		  	</#if>
 	  	</#list>
 	  </ol>
diff --git a/webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/vertical_breadcrumb.html b/webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/vertical_breadcrumb.html
index e661d3ee8..47cc5d20b 100644
--- a/webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/vertical_breadcrumb.html
+++ b/webapp/WEB-INF/templates/util/plugins/forms/breadcrumb/vertical_breadcrumb.html
@@ -3,7 +3,7 @@
 	  <div class="panel panel-default">
 	  	<#list list_steps as step>
 			<div class="panel-heading">
-				<h3 class="panel-title">${step.title}</h3>
+				<h3 class="panel-title">${step.title!?replace('- hidden','')}</h3>
 			</div>
 	  	</#list>
 	  </div>