diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index a119260713..171fb4500f 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -7835,13 +7835,13 @@ public function renderCreateFieldset($id, $fdata, $model, $tab=0)
 			{
 				continue;
 			}
-			
+
 			// convert aliases - not supported in edit mod
 			if(vartrue($att['alias']) && !$model->hasData($key))
 			{
 				$key = $att['field'];
 			}
-			
+
 			if($key === 'checkboxes' || $key === 'options' || (varset($att['type']) === null) || (varset($att['type']) === false))
 			{
 				continue;
@@ -7903,7 +7903,7 @@ public function renderCreateFieldset($id, $fdata, $model, $tab=0)
 			}
 
 			// type null - system (special) fields
-			if(vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
+			if(!empty($att['writeParms']['visible']) || ( vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName()))
 			{
 				$required = '';
 				$required_class = '';