diff --git a/passbook/core/templates/login/base.html b/passbook/core/templates/login/base.html
index 597434c48..b69d941e0 100644
--- a/passbook/core/templates/login/base.html
+++ b/passbook/core/templates/login/base.html
@@ -3,6 +3,23 @@
 {% load static %}
 {% load i18n %}
 
+{% block head %}
+<style>
+  .login-pf-page .login-pf-page-footer-links {
+    padding: 15px;
+    background-color: #fff;
+  }
+
+  .login-pf-page .login-pf-page-footer-link {
+    color: #72767b;
+  }
+
+  .login-pf-page .login-pf-page-footer-links li:not(:last-of-type):after {
+    color: #72767b;
+  }
+</style>
+{% endblock %}
+
 {% block body %}
 <div class="login-pf-page">
   <div class="container-fluid">
@@ -33,4 +50,4 @@
     </div><!-- row -->
   </div><!-- container -->
 </div><!-- login-pf-page -->
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/passbook/core/templates/login/form.html b/passbook/core/templates/login/form.html
index e3a224e88..e88d5c272 100644
--- a/passbook/core/templates/login/form.html
+++ b/passbook/core/templates/login/form.html
@@ -5,30 +5,18 @@
 
 {% block card %}
 <header class="login-pf-header">
-  <h1>{% trans 'Log In to Your Account' %}</h1>
+  <h1>{% trans title %}</h1>
 </header>
 {% include 'partials/messages.html' %}
 <form method="POST">
   {% csrf_token %}
-  <div class="form-group">
-    <label class="sr-only" for="uid_field">{% trans 'UID' %}</label>
-    <input type="text" class="form-control input-lg" name="uid_field" placeholder="UID">
-  </div>
-  <div class="form-group">
-    <label class="sr-only" for="password">{% trans 'Password' %}</label>
-    <input type="password" class="form-control input-lg" name="password" placeholder="Password">
-  </div>
-  <div class="form-group login-pf-settings">
-    <label class="checkbox-label">
-      <input name="remember_me" type="checkbox"> {% trans 'Keep me logged in for 30 days' %}
-    </label>
-    {% if config.password_reset.enabled %}
-    <a href="#">{% trans 'Forgot password?' %}</a>
-    {% endif %}
-  </div>
-  <button type="submit" class="btn btn-primary btn-block btn-lg">Log In</button>
+  {% include 'partials/form_login.html' %}
+  <button type="submit" class="btn btn-primary btn-block btn-lg">{% trans primary_action %}</button>
 </form>
-{% if config.sign_up.enabled %}
-<p class="login-pf-signup">{% trans 'Need an account?' %}<a href="#">{% trans 'Sign up' %}</a></p>
+{% if show_sign_up_notice %}
+<p class="login-pf-signup">
+  {% trans 'Need an account?' %}
+  <a href="{% url 'passbook_core:auth-sign-up' %}">{% trans 'Sign up' %}</a>
+</p>
 {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/passbook/core/templates/partials/form_login.html b/passbook/core/templates/partials/form_login.html
new file mode 100644
index 000000000..1129396a8
--- /dev/null
+++ b/passbook/core/templates/partials/form_login.html
@@ -0,0 +1,57 @@
+{% load utils %}
+{% load i18n %}
+
+{% csrf_token %}
+{% for field in form %}
+<div class="form-group login-pf-settings">
+  {% if field.field.widget|fieldtype == 'RadioSelect' %}
+    <label class="col-sm-2 control-label" {% if field.field.required %}class="required"{% endif %} for="{{ field.name }}-{{ forloop.counter0 }}">
+      {{ field.label }}
+    </label>
+    {% for c in field %}
+    <div class="radio col-sm-10">
+      <input type="radio" id="{{ field.name }}-{{ forloop.counter0 }}" name="{% if wizard %}{{ wizard.steps.current }}-{% endif %}{{ field.name }}" value="{{ c.data.value }}" {% if c.data.selected %} checked {% endif %}>
+      <label class="col-sm-2 control-label" for="{{ field.name }}-{{ forloop.counter0 }}">{{ c.choice_label }}</label>
+    </div>
+    {% endfor %}
+  {% elif field.field.widget|fieldtype == 'Select' %}
+    <label class="col-sm-2 control-label" {% if field.field.required %}class="required"{% endif %} for="{{ field.name }}-{{ forloop.counter0 }}">
+      {{ field.label }}
+    </label>
+    <div class="select col-sm-10">
+      {{ field }}
+    </div>
+  {% elif field.field.widget|fieldtype == 'CheckboxInput' %}
+    <label class="checkbox-label">
+      {{ field }} {{ field.label }}
+    </label>
+    {% if show_password_forget_notice %}
+    <a href="#">{% trans 'Forgot password?' %}</a>
+    {% endif %}
+  {% else %}
+  <label class="col-sm-2 sr-only" {% if field.field.required %}class="required"{% endif %} for="{{ field.name }}-{{ forloop.counter0 }}">
+    {{ field.label }}
+  </label>
+  {{ field|css_class:'form-control input-lg' }}
+  {% if field.help_text %}
+  <span>
+    {{ field.help_text }}
+  </span>
+  {% endif %}
+  {% endif %}
+  {% for error in field.errors %}
+  <div class="alert alert-danger">
+    <div class="alert-items">
+      <div class="alert-item">
+        <div class="alert-icon-wrapper">
+          <clr-icon class="alert-icon" shape="exclamation-circle"></clr-icon>
+        </div>
+        <span class="alert-text">
+          {{ error }}
+        </span>
+      </div>
+    </div>
+  </div>
+  {% endfor %}
+</div>
+{% endfor %}