diff --git a/app/sso/services/__init__.py b/app/sso/services/__init__.py
index 3b5bbde..8760886 100644
--- a/app/sso/services/__init__.py
+++ b/app/sso/services/__init__.py
@@ -29,7 +29,8 @@ class BaseService():
 
     settings = { 'require_user': True,
                  'require_password': True,
-                 'provide_login': False }
+                 'provide_login': False,
+                 'use_auth_username': True, }
 
     def add_user(self, username, password, **kwargs):
         """ Add a user, returns a dict for that user """
diff --git a/app/sso/templates/sso/apipassword.html b/app/sso/templates/sso/apipassword.html
index 7371fa6..3865f96 100644
--- a/app/sso/templates/sso/apipassword.html
+++ b/app/sso/templates/sso/apipassword.html
@@ -1,19 +1,22 @@
 {% extends "base.html" %}
 
-{% block title %}External Auth API Services Password Reset{% endblock %}
+{% block title %}Change Services Password{% endblock %}
 
 {% block content %}
 
+<div class="page-header">
+  <h1>Change Services Password</h1>
+</div>
+
 <p>This service will reset your password for all External Auth API Services. If you wish to continue please enter a new
 password below.</p>
 
 <form action="{% url sso.views.set_apipasswd %}" method="post">
-<table>
-{{ form.as_table }}
-</table>
-<br />
-{% csrf_token %}
-<input type="submit" value="Reset Account" />
+<formset>
+  {% include "formtools/formfield.html" with field=form.password %}
+  {% csrf_token %}
+  <input type="submit" value="Reset Account" class="btn primary" />
+</formset>
 </form>
 
 {% endblock %}
diff --git a/app/sso/templates/sso/emailchange.html b/app/sso/templates/sso/emailchange.html
index 5f4d8f7..fecd04c 100644
--- a/app/sso/templates/sso/emailchange.html
+++ b/app/sso/templates/sso/emailchange.html
@@ -8,13 +8,12 @@
 </div>
 
 <form action="" method="post">
-  <fieldset>
-    <table>
-    {{ form.as_table }}
-    </table>
-    {% csrf_token %}
-    <input type="submit" value="Change Email" class="btn"/>
-  </fieldset>
+<fieldset>
+  {% include "formtools/formfield.html" with field=form.email1 %}
+  {% include "formtools/formfield.html" with field=form.email2 %}
+  {% csrf_token %}
+  <input type="submit" value="Change Email" class="btn primary"/>
+</fieldset>
 </form>
 
 {% endblock %}
diff --git a/app/sso/templates/sso/primarycharchange.html b/app/sso/templates/sso/primarycharchange.html
index 1ab6956..7d19ab7 100644
--- a/app/sso/templates/sso/primarycharchange.html
+++ b/app/sso/templates/sso/primarycharchange.html
@@ -8,12 +8,11 @@
 <p>Your primary character is used across auth services to show as your display name and corporation. Please set this to which character you consider your "main".</p>
 
 <form action="" method="post">
-<table>
-{{ form.as_table }}
-</table>
-<br />
-{% csrf_token %}
-<input type="submit" value="Change" />
+<fieldset>
+  {% include "formtools/formfield.html" with field=form.character %}
+  {% csrf_token %}
+  <input type="submit" value="Change" class="btn primary" />
+</fieldset>
 </form>
 
 {% endblock %}
diff --git a/app/sso/templates/sso/profile.html b/app/sso/templates/sso/profile.html
index ff66f51..500858e 100644
--- a/app/sso/templates/sso/profile.html
+++ b/app/sso/templates/sso/profile.html
@@ -48,24 +48,26 @@
   <h2>Service Accounts</h2>
   <p>These are services that cannot talk to auth and require a seperate username/password.</p>
   {% if user.serviceaccount_set.all %}
-  <table>
-  <tr><th>Service</th><th>Username</th><th>URL</th><th>Active</th><th>Actions</th></tr>
-  {% for acc in user.serviceaccount_set.all %}
-  <tr><td>{{ acc.service }}</td>
-      <td>{{ acc.service_uid }}</td>
-      <td><a href="{{ acc.service.url }}">{{ acc.service.url }}</a></td>
-    <td>{% if acc.active %}Yes{% else %}No{% endif %}</td>
-    <td>
-    {% if acc.active %}
-    {% if acc.service.settings.require_password %}<a href="{% url sso.views.service_reset acc.id %}">Reset</a>&nbsp;/&nbsp;{% endif %}
-    <a href="{% url sso.views.service_del acc.id %}">Delete</a>
-    {% if acc.service.provide_login %}
-    &nbsp;/&nbsp;<a href="{% url sso.views.service_login acc.id %}">Login</a>
-    {% endif %}
-    {% endif %}
-    </td>
-  </tr>
-  {% endfor %}
+  <table class="zebra-striped" id="services">
+    <thead>
+      <tr><th>Service</th><th>Username</th><th>URL</th><th>Active</th><th>Actions</th></tr>
+    </thead>
+    <tbody>
+      {% for acc in user.serviceaccount_set.all %}
+      <tr><td>{{ acc.service }}</td>
+        <td>{{ acc.service_uid }}</td>
+        <td><a href="{{ acc.service.url }}">{{ acc.service.url }}</a></td>
+        <td>{% if acc.active %}Yes{% else %}No{% endif %}</td>
+        <td>
+          {% if acc.active %}
+          {% if acc.service.settings.require_password %}<a href="{% url sso.views.service_reset acc.id %}">Reset</a>&nbsp;/&nbsp;{% endif %}
+          <a href="{% url sso.views.service_del acc.id %}">Delete</a>
+          {% if acc.service.provide_login %}&nbsp;/&nbsp;<a href="{% url sso.views.service_login acc.id %}">Login</a>{% endif %}
+          {% endif %}
+        </td>
+      </tr>
+      {% endfor %}
+    </tbody>
   </table>
   {% endif %}
   <p>
@@ -93,7 +95,7 @@
         <td>{{ acc.api_user_id }}</td>
         <td>{{ acc.api_key|slice:":10" }}&#8230;</td>
         <td>{{ acc.description }}</td>
-        <td><a href="#" class="accesspopup" id="{{ acc.api_user_id}}" data-original-title="Access for Key {{ acc.api_user_id }}" data-content="test" rel="popover">{{ acc.get_api_keytype_display }}</a>{% if acc.api_keytype == 4 %}&nbsp;<b><sup style="color: red;">*</sup></b>{% endif %}</td>
+        <td><a href="#" class="accesspopup" id="{{ acc.api_user_id}}" data-original-title="Access for Key {{ acc.api_user_id }}" rel="popover">{{ acc.get_api_keytype_display }}</a>{% if acc.api_keytype == 4 %}&nbsp;<b><sup style="color: red;">*</sup></b>{% endif %}</td>
         <td id="api-status-{{ acc.api_user_id }}">{{ acc.get_api_status_display }}</td>
         <td id="api-time-{{ acc.api_user_id }}">{{ acc.api_last_updated|naturaltimediff }}</td>
         <td>{% ifswitch api-disableprocessing %}{% else %}<a href="{% url eve_api.views.eveapi_refresh acc.api_user_id %}"  onclick="javascript:refresh_apikey({{ acc.api_user_id }}); return false;">Refresh</a>,&nbsp;
@@ -115,34 +117,6 @@
   <a href="{% url sso.views.refresh_access %}" class="btn {% if not user.eveaccount_set.all %}disabled{% else %}danger{% endif %}" title="Forces auth to recheck your permissions and update your services as needed">Force Access Update</a>
   {% endifswitch %}
   </p>
-
-  <script type="text/javascript">
-  function refresh_apikey(key) {
-    $("#api-status-" + key).html("<center><img src='{{ STATIC_URL }}img/spinner.gif'/></center>");
-    $("#api-time-" + key).html("<center><img src='{{ STATIC_URL }}img/spinner.gif'/></center>");
-    $.getJSON("/eve/eveapi/refresh/" + key + "/", function(json) {
-            $("#api-time-" + json[0].pk).html("a moment ago");
-
-            switch(json[0].fields.api_status) {
-                case 0:
-                    $("#api-status-" + json[0].pk).html("Unknown");
-                    break;
-                case 1:
-                    $("#api-status-" + json[0].pk).html("OK");
-                    break;
-                case 2:
-                    $("#api-status-" + json[0].pk).html("Other Error");
-                    break;
-                case 3:
-                    $("#api-status-" + json[0].pk).html("Account Expired");
-                    break;
-                default:
-                    $("#api-status-" + json[0].pk).html("Error");
-                    break;
-            }
-    });
-  }
-  </script>
 </div>
 
 {% if "reddit"|installed %}
@@ -185,22 +159,50 @@
     e.preventDefault();
     var el = $(this);
     var id = $(this).attr('id');
-    $.ajax({
-         type: 'GET',
-         url: '/eve/eveapi/access/' + id + '/',
-         dataType: 'html',
-         success: function(data) {
-             el.attr('data-content', data);
-             el.popover('show');
-         },
-    });
+    if (!el.attr('data-content')) {
+        $.ajax({
+            type: 'GET',
+            url: '/eve/eveapi/access/' + id + '/',
+            dataType: 'html',
+            success: function(data) {
+                el.attr('data-content', data);
+                el.popover('show');
+            },
+        });
+   } else {
+      el.popover('show');
+   }
   }
 
   $('.tabs').tabs();
   $("table#eveapikeys").tablesorter({ sortList: [[0,0]] });
   $('.accesspopup').popover({html: 'true', trigger: 'manual'});
   $('.accesspopup').hover(access_popover, function () { $(this).popover('hide') });
+
+
+  function refresh_apikey(key) {
+    $("#api-status-" + key).html("<center><img src='{{ STATIC_URL }}img/spinner.gif'/></center>");
+    $("#api-time-" + key).html("<center><img src='{{ STATIC_URL }}img/spinner.gif'/></center>");
+    $.getJSON("/eve/eveapi/refresh/" + key + "/", function(json) {
+      $("#api-time-" + json[0].pk).html("a moment ago");
+      switch(json[0].fields.api_status) {
+        case 0:
+          $("#api-status-" + json[0].pk).html("Unknown");
+          break;
+        case 1:
+          $("#api-status-" + json[0].pk).html("OK");
+          break;
+        case 2:
+          $("#api-status-" + json[0].pk).html("Other Error");
+          break;
+        case 3:
+          $("#api-status-" + json[0].pk).html("Account Expired");
+          break;
+        default:
+          $("#api-status-" + json[0].pk).html("Error");
+          break;
+      }
+    });
+  }
 </script>
-
-
 {% endblock %}
diff --git a/app/sso/templates/sso/serviceaccount/add.html b/app/sso/templates/sso/serviceaccount/add.html
index fd54a5f..a5b58f6 100644
--- a/app/sso/templates/sso/serviceaccount/add.html
+++ b/app/sso/templates/sso/serviceaccount/add.html
@@ -3,9 +3,12 @@
 {% block title %}Add External Service Account{% endblock %}
 
 {% block content %}
+<div class="page-header">
+  <h1>Add Service</h1>
+</div>
+
 <p>To add a service to your account, select the service from the list
-below
-then provide select a username you wish to use create the account for<br/>
+below then provide select a username you wish to use create the account for.
 <br/>
 For details on how to connect to each service, please consult the <a
 href="http://wiki.dredd.it">wiki</a></p>
@@ -13,13 +16,13 @@ href="http://wiki.dredd.it">wiki</a></p>
 <p>If you are missing some services, please check that your API key is
 up to date, if so use the "Refresh" function.</p>
 
-<form action="{% url sso.views.service_add serviceid %}" method="post">
-<table>
-{{ form.as_table }}
-</table>
-<br />
-<input type="submit" value="Create Account" />
-{% csrf_token %}
-</form>
+<form action="{% url sso.views.service_add %}" method="post">
+<fieldset>
+  {% include "formtools/formfield.html" with field=form.character %}
+  {% include "formtools/formfield.html" with field=form.service %}
+  {% include "formtools/formfield.html" with field=form.password %}
+  {% csrf_token %}
+  <input type="submit" value="Create Account" />
+</fieldset>
 <br/>
 {% endblock %}
diff --git a/app/sso/templates/sso/serviceaccount/created.html b/app/sso/templates/sso/serviceaccount/created.html
index 4c75fa5..cf3347e 100644
--- a/app/sso/templates/sso/serviceaccount/created.html
+++ b/app/sso/templates/sso/serviceaccount/created.html
@@ -3,6 +3,11 @@
 {% block title %}External Service Account{% endblock %}
 
 {% block content %}
+
+<div class="page-header">
+  <h1>Add Service</h1>
+</div>
+
 {% if error %}
 <div style="border: 1px solid #FF0000; background: #FF7D7D; width: 100%; text-align: center;">
 <b>Error:</b> Your account has not been created. Either you already have a user on this service or a error has occured. If you think 
diff --git a/app/sso/templates/sso/serviceaccount/index.html b/app/sso/templates/sso/serviceaccount/index.html
deleted file mode 100644
index 0b40993..0000000
--- a/app/sso/templates/sso/serviceaccount/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Add External Service Account{% endblock %}
-
-{% block content %}
-<p>To add a service to your account, select the service from the list
-below
-then provide select a username you wish to use create the account for<br/>
-<br/>
-For details on how to connect to each service, please consult the <a
-href="http://wiki.dredd.it">wiki</a></p>
-
-<p>If you are missing some services, please check that your API key is
-up to date, if so use the "Refresh" function.</p>
-
-<form action="{% url sso.views.service_add %}" method="post">
-<table>
-{{ form.as_table }}
-</table>
-<br />
-<input type="submit" value="Create Account" />
-{% csrf_token %}
-</form>
-<br/>
-{% endblock %}
diff --git a/app/sso/templates/sso/serviceaccount/noneavailable.html b/app/sso/templates/sso/serviceaccount/noneavailable.html
index 7c28028..2cfd714 100644
--- a/app/sso/templates/sso/serviceaccount/noneavailable.html
+++ b/app/sso/templates/sso/serviceaccount/noneavailable.html
@@ -3,6 +3,10 @@
 {% block title %}External Service Account{% endblock %}
 
 {% block content %}
+<div class="page-header">
+  <h1>Add Service</h1>
+</div>
+
 <p>You have no services available to add to your account</p>
 
 <p>If this is unexpected, please check that your API key is correct. If 
diff --git a/app/sso/templates/sso/serviceaccount/reset.html b/app/sso/templates/sso/serviceaccount/reset.html
index 4a7d4ab..d1a5a38 100644
--- a/app/sso/templates/sso/serviceaccount/reset.html
+++ b/app/sso/templates/sso/serviceaccount/reset.html
@@ -1,18 +1,20 @@
 {% extends "base.html" %}
 
-{% block title %}External Service Account Password Reset{% endblock %}
+{% block title %}Reset Service{% endblock %}
 
 {% block content %}
+<div class="page-header">
+  <h1>Reset Service</h1>
+</div>
 
 <p>This service will reset your password for account {{ acc.service_uid }} on {{ acc.service }}. If you wish to continue please click the link 
 below.</p>
 
 <form action="{% url sso.views.service_reset serviceid %}" method="post">
-<table>
-{{ form.as_table }}
-</table>
-{% csrf_token %}
-<input type="submit" value="Reset Account" />
+<fieldset>
+  {% include "formtools/formfield.html" with field=form.password %}
+  {% csrf_token %}
+  <input type="submit" value="Reset Account" class="btn primary"/>
+</fieldset>
 </form>
-
 {% endblock %}
diff --git a/app/sso/views.py b/app/sso/views.py
index c7983ef..6b1b8ca 100644
--- a/app/sso/views.py
+++ b/app/sso/views.py
@@ -91,7 +91,7 @@ def service_add(request):
         else:
             form = clsform() # An unbound form
 
-    return render_to_response('sso/serviceaccount/index.html', locals(), context_instance=RequestContext(request))
+    return render_to_response('sso/serviceaccount/add.html', locals(), context_instance=RequestContext(request))
 
 
 @login_required