diff --git a/pgweb/core/templatetags/pgfilters.py b/pgweb/core/templatetags/pgfilters.py
index 37157201..3429bf1f 100644
--- a/pgweb/core/templatetags/pgfilters.py
+++ b/pgweb/core/templatetags/pgfilters.py
@@ -7,3 +7,7 @@ register = template.Library()
 def hidemail(value):
 	return value.replace('@', ' at ')
 
+@register.filter(name='class_name')
+def class_name(ob):
+	return ob.__class__.__name__
+
diff --git a/templates/base/form.html b/templates/base/form.html
index 84be873f..f00b67a6 100644
--- a/templates/base/form.html
+++ b/templates/base/form.html
@@ -1,4 +1,5 @@
 {%extends "base/page.html"%}
+{%load pgfilters%}
 {%block title%}{{operation|default:"Edit"}} {{formitemtype}}{%endblock%}
 {%block contents%}
 <h1>{{operation|default:"Edit"}} {{formitemtype}}</h1>
@@ -22,10 +23,17 @@
  </tr>
  {%endif%}
  <tr {%if field.errors%}class="errorinfo"{%endif%}>
-  <th>{{field.label_tag}}{%if field.help_text %}<br/>
-   <span class="formfieldhelp">{{field.help_text}}</span>{%endif%}</th>
+  <th>{{field.label_tag}}{%if field.help_text%}{%if field.field.widget|class_name == "Textarea"%}<br/>
+   <span class="formfieldhelp">{{field.help_text|safe}}</span>{%endif%}{%endif%}
+  </th>
   <td>{{field}}</td>
  </tr>
+{%if field.help_text %}{%if field.field.widget|class_name != "Textarea"%}
+<tr>
+  <th></th>
+  <td><span class="formfieldhelp">{{field.help_text|safe}}</span></td>
+</tr>
+{%endif%}{%endif%}
 {%endfor%}
 </table>
 <input type="submit" value="{{savebutton|default:"Save"}}" />