-<form class="cuteform hidelabels" method="post" action="{% url openid_login %}">
-<ul>
- {% csrf_token %}
- {{ form|placeholdized_ul }}
- <li><input type="submit" value='{% trans "Login" %}' /></li>
-</ul>
+<form id="openid_login_form" class="openid_login uniForm" method="post" action="{% url openid_login %}">
+{% csrf_token %}
+<fieldset class="inlineLabels">
+
+{#{form|as_uni_form}#}
+<div id="div_id_openid" class="ctrlHolder">
+<label for="id_openid" class="requiredField">
+OpenID<span class="asteriskField">*</span>
+</label>
+<input id="id_openid" type="text" class="textInput textinput" name="openid" />
+</div>
+
+
+<div class="buttonHolder">
+<button type="submit">{% trans "Sign In" %}</button>
+</div>
+</fieldset>