diff --git a/users/templates/users/_form.html b/users/templates/users/_form.html
index ef58afc..1fd76ac 100644
--- a/users/templates/users/_form.html
+++ b/users/templates/users/_form.html
@@ -38,16 +38,22 @@
 				{% if field.field.required %}
 					<label for="{{ field.auto_id }}">{{ field.label }} <span>*</span></label>
 				{% else %}
-									{% if field.auto_id == 'id_x' or field.auto_id == 'id_y' or field.auto_id == 'id_width' or field.auto_id == 'id_height'%}
+									{% if field.auto_id == 'id_x' or field.auto_id == 'id_show_email' or field.auto_id == 'id_y' or field.auto_id == 'id_width' or field.auto_id == 'id_height'%}
 
 									{% else %}
+
 											<label for="{{ field.auto_id }}">{{ field.label }}</label>
 									{% endif %}
 
 
 				{% endif %}
+				{% if field.auto_id == 'id_show_email' %}
+
+				{% else %}
+							{% render_field field class='form-control' %}
+				{% endif %}
+
 
-				{% render_field field class='form-control' %}
 			{% endif %}
 				<span id="helpBlock" class="help-block">{{ field.help_text }}</span>
 			{% if field.errors %}
diff --git a/users/templates/users/register.html b/users/templates/users/register.html
index f15fec7..f305722 100644
--- a/users/templates/users/register.html
+++ b/users/templates/users/register.html
@@ -59,10 +59,11 @@
 							                </div>
 							            {% else %}
 							            	{% if field.auto_id == 'id_show_email' %}
-							            		<label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
+														{% else %}
+															{% render_field field class='form-control' %}
 							            	{% endif %}
 
-											{% render_field field class='form-control' %}
+
 										{% endif %}
 										<span class="help-block">{{ field.help_text }}</span>
 										{% if field.errors %}
--
libgit2 0.21.2