diff --git a/src/GeoNodePy/geonode/templates/registration/login.html b/src/GeoNodePy/geonode/templates/registration/login.html
index c1e5ed8fcca..09d5e47ec52 100644
--- a/src/GeoNodePy/geonode/templates/registration/login.html
+++ b/src/GeoNodePy/geonode/templates/registration/login.html
@@ -9,16 +9,11 @@ <h2>GeoNode Login</h2>
 
   <form method="post" action="{% url django.contrib.auth.views.login %}">
     {% csrf_token %}
-    <p>
-        {{ form.username.label_tag }}
-        {{ form.username }}
-    </p>
-    <p>
-        {{ form.password.label_tag }}
-        {{ form.password }}
-    </p>
-    <input type="hidden" name="next" value="{{next}}" />
-    <input type="submit" value="Login"/>
+	<ul class="form">
+		  {{ form.as_ul }}
+		<li><input type="hidden" name="next" value="{{next}}" /></li>
+	    <li><input type="submit" value="Login"/></li>
+	</ul>
   </form>
 </div>
 {% endblock %}
diff --git a/src/GeoNodePy/geonode/templates/registration/registration_form.html b/src/GeoNodePy/geonode/templates/registration/registration_form.html
index 683998e366a..1fbfc0acd82 100644
--- a/src/GeoNodePy/geonode/templates/registration/registration_form.html
+++ b/src/GeoNodePy/geonode/templates/registration/registration_form.html
@@ -5,9 +5,10 @@
 <div class="twocol">
   <form method="post" action=".">
     {% csrf_token %}
-    {{ form.as_p }}
-
-    <input type="submit" value="{% trans 'Submit' %}" />
+   <ul class="form">
+	  {{ form.as_ul }}
+      <li><input type="submit" value="{% trans 'Submit' %}" /></li>
+   </ul>
   </form>
 </div>
 {% endblock %}
diff --git a/src/geonode-client/src/theme/app/site.css b/src/geonode-client/src/theme/app/site.css
index 67605cda982..fd91b4a9922 100644
--- a/src/geonode-client/src/theme/app/site.css
+++ b/src/geonode-client/src/theme/app/site.css
@@ -650,6 +650,7 @@ clear: both;
 div#main form ul.form li label {
 display: block;
 font-weight: bold;
+text-transform: capitalize;
 }
 
 div#main form ul.form li input {