diff --git a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
index 6387ff7657..b3bfdf8c2d 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
@@ -294,6 +294,10 @@ EOF
 						$oOutput->AddHtml('<input type="hidden" id="' . $this->oField->GetGlobalId() . '" name="' . $this->oField->GetId() . '" value="' . $this->oField->GetCurrentValue() . '" class="form-control" />');
 						$oOutput->AddHtml('</div>');
 						break;
+
+					case 'Combodo\\iTop\\Form\\Field\\HiddenField':
+						$oOutput->AddHtml('<input type="hidden" id="' . $this->oField->GetGlobalId() . '" name="' . $this->oField->GetId() . '" value="')->AddHtml($this->oField->GetCurrentValue(), true)->AddHtml('"/>');
+						break;
 				}
 			}
 		}
diff --git a/sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php
index a6a91c57e8..f34878d59a 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bssubformfieldrenderer.class.inc.php
@@ -29,20 +29,8 @@ class BsSubFormFieldRenderer extends FieldRenderer
 	{
 		$oOutput = new RenderingOutput();
 		
-		// Checking if subform has visible fields
-		$bHasVisibleFields = false;
-		foreach ($this->oField->GetForm()->GetFields() as $oSubFormField)
-		{
-			$sSubFormFieldClass = get_class($oSubFormField);
-			// Note : This is a dirty hack for templates. As they show a label when there is no template, we have to detect it...
-			if (($sSubFormFieldClass !== 'Combodo\iTop\Form\Field\HiddenField') && ($oSubFormField->GetId() !== '_no_template_'))
-			{
-				$bHasVisibleFields = true;
-			}
-		}
-
 		// Showing subform if there are visible fields
-		if (!$bHasVisibleFields)
+		if (!$this->oField->GetForm()->HasVisibleFields())
 		{
 			$oOutput->AddHtml('<div class="hidden">');
 		}
@@ -56,14 +44,13 @@ class BsSubFormFieldRenderer extends FieldRenderer
 		{
 			$oOutput->AddHtml('</fieldset>');
 		}
-		if (!$bHasVisibleFields)
+		if (!$this->oField->GetForm()->HasVisibleFields())
 		{
 			$oOutput->AddHtml('</div>');
 		}
-
+		
 		$oRenderer = new BsFormRenderer($this->oField->GetForm());
 		$aRenderRes = $oRenderer->Render();
-
 		$aFieldSetOptions = array(
 			'fields_list' => $aRenderRes,
 			'fields_impacts' => $this->oField->GetForm()->GetFieldsImpacts(),