diff --git a/view/templates/field_checkbox.tpl b/view/templates/field_checkbox.tpl
index b66cced876..8275d4595d 100644
--- a/view/templates/field_checkbox.tpl
+++ b/view/templates/field_checkbox.tpl
@@ -1,6 +1,8 @@
 	<div class="field checkbox" id="div_id_{{$field.0}}">
-		<label for="id_{{$field.0}}">{{$field.1}}</label>
+		<label id="id_{{$field.0}}_label" for="id_{{$field.0}}">{{$field.1}}</label>
 		<input type="hidden" name="{{$field.0}}" value="0">
 		<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip" value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.4}}{{$field.4}}{{/if}}>
+		{{if $field.3}}
 		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl
index 4586550166..876e607cdf 100644
--- a/view/templates/field_combobox.tpl
+++ b/view/templates/field_combobox.tpl
@@ -13,6 +13,8 @@
 			{{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{$val}}</option>{{/foreach}}
 		</select>
 		
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
 
diff --git a/view/templates/field_custom.tpl b/view/templates/field_custom.tpl
index 0b09284023..6649b0ff94 100644
--- a/view/templates/field_custom.tpl
+++ b/view/templates/field_custom.tpl
@@ -3,5 +3,7 @@
 	<div class='field custom'>
 		<label for='{{$field.0}}'>{{$field.1}}</label>
 		{{$field.2}}
-		<span class='field_help'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl
index 495493f2fd..850656bb8c 100644
--- a/view/templates/field_input.tpl
+++ b/view/templates/field_input.tpl
@@ -2,5 +2,7 @@
 	<div class='field input' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby='{{$field.0}}_tip'>
+		{{if $field.3}}
 		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl
index 73bdf60417..9c5f04e796 100644
--- a/view/templates/field_intcheckbox.tpl
+++ b/view/templates/field_intcheckbox.tpl
@@ -3,5 +3,7 @@
 	<div class='field checkbox'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="true"{{/if}} aria-describedby='{{$field.0}}_tip'>
+		{{if $field.4}}
 		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl
index 062ac6ac6e..9a18bbc13c 100644
--- a/view/templates/field_openid.tpl
+++ b/view/templates/field_openid.tpl
@@ -2,5 +2,7 @@
 	<div class='field input openid' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl
index 333ce67c38..4b4d4f2b2e 100644
--- a/view/templates/field_password.tpl
+++ b/view/templates/field_password.tpl
@@ -2,5 +2,7 @@
 	<div class='field password' id='wrapper_{{$field.0}}'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
+		{{if $field.3}}
 		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl
index 6b880ed997..1e1d8e0b10 100644
--- a/view/templates/field_radio.tpl
+++ b/view/templates/field_radio.tpl
@@ -1,5 +1,7 @@
 	<div class='field radio'>
 		<label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label>
 		<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2|escape:'html'}}" {{if $field.4}}checked{{/if}} aria-describedby={{$field.0}}_{{$field.2}}_tip'>
+		{{if $field.3}}
 		<span class='field_help' role='tooltip' id='{{$field.0}}_{{$field.2}}_tip'>{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_richtext.tpl b/view/templates/field_richtext.tpl
index 67553bb95a..bc346ddb0b 100644
--- a/view/templates/field_richtext.tpl
+++ b/view/templates/field_richtext.tpl
@@ -3,5 +3,7 @@
 	<div class='field richtext'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext" aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl
index 2d037439df..87a2ab9ff8 100644
--- a/view/templates/field_select.tpl
+++ b/view/templates/field_select.tpl
@@ -5,5 +5,7 @@
 		<select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
 			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
 		</select>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl
index 4c826a0427..147c028eff 100644
--- a/view/templates/field_select_raw.tpl
+++ b/view/templates/field_select_raw.tpl
@@ -5,5 +5,7 @@
 		<select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
 			{{$field.4}}
 		</select>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl
index c37537d6ec..60594a2666 100644
--- a/view/templates/field_textarea.tpl
+++ b/view/templates/field_textarea.tpl
@@ -3,5 +3,7 @@
 	<div class='field textarea'>
 		<label for='id_{{$field.0}}'>{{$field.1}}</label>
 		<textarea name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>
diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl
index 51f6057ae3..5f56c187ef 100644
--- a/view/templates/field_themeselect.tpl
+++ b/view/templates/field_themeselect.tpl
@@ -5,6 +5,8 @@
 		<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} aria-describedby='{{$field.0}}_tip'>
 			{{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
 		</select>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 		{{if $field.5}}<div id="theme-preview"></div>{{/if}}
 	</div>
diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl
index 155d0488b3..7e7c3cc4ee 100644
--- a/view/templates/field_yesno.tpl
+++ b/view/templates/field_yesno.tpl
@@ -10,5 +10,7 @@
 				{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
 			</a>
 		</div>
-		<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
+		{{if $field.3}}
+		<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
+		{{/if}}
 	</div>