diff --git a/templates/profile.html b/templates/profile.html
index 0f13b0b..3a64d71 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -67,4 +67,7 @@ setup.</p>
 <p>
 <a href="/profile/add/eveapi">Add a Eve API key</a>
 </p>
+<p>If you encounter any errors during using this service, copy the massive 
+error message into <a href="http://pastebin.com/">Pastebin</a> and give 
+Matalok a good kicking on IRC/Jabber/Email or on the Forums.</p>
 {% endblock %}
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 42deda4..773feed 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,3 +1,6 @@
+{% extends "base.html" %}
+
+{% block content %}
 {% load i18n %}
 {% block HeadTag %}
 <script type="text/javascript">
@@ -30,3 +33,4 @@
 </ul>
 {% endblock %}
 
+{% endblock %}
diff --git a/templates/sso/eveapi.html b/templates/sso/eveapi.html
index 06cc466..e1b4f5f 100644
--- a/templates/sso/eveapi.html
+++ b/templates/sso/eveapi.html
@@ -1,3 +1,8 @@
+{% extends "base.html" %}
+
+{% block title %}Add EVE API Key{% endblock %}
+
+{% block content %}
 <p>Please fill in your API key as provided on the <a
 href="http://eve-online.com/api">EVE Online API
 page</a></p>
@@ -6,3 +11,4 @@ page</a></p>
 {{ form.as_p }}
 <input type="submit" value="Submit" />
 </form>
+{% endblock %}
diff --git a/templates/sso/serviceaccount.html b/templates/sso/serviceaccount.html
index db5710f..a90e424 100644
--- a/templates/sso/serviceaccount.html
+++ b/templates/sso/serviceaccount.html
@@ -1,4 +1,15 @@
+{% extends "base.html" %}
+
+{% block title %}Add Service Account{% endblock %}
+
+{% block content %}
+<p>To add a service to your account, selec the service from the list below 
+then provide a username and password you wish to use to connect.<br/>
+<br/>
+For details on how to connect to each service, please consult the <a 
+href="http://wiki.dredd.it">wiki</a></p>
 <form action="/profile/add/service" method="post">
 {{ form.as_p }}
 <input type="submit" value="Submit" />
 </form>
+{% endblock %}