diff --git a/templates/profile.html b/templates/profile.html
index 8c46eef..0f13b0b 100644
--- a/templates/profile.html
+++ b/templates/profile.html
@@ -10,7 +10,10 @@
 <li><b>Username:</b> {{ user.username }}</li>
 </ul>
 
+{% if eveaccounts %}
 <h2>Service Accounts</h2>
+<p>This is a list of all your current service accounts, to create a login for 
+a new service click the Add Service link</p>
 {% if srvaccounts %}
 <table>
 <thead>
@@ -35,8 +38,14 @@
 </p>
 
 <br/>
+{% endif %}
 
 <h2>Eve API Keys</h2>
+<p>Adding a Eve API key will allow you to access any services allowed for your 
+corporation. Limited keys are accepted for service validation. API keys 
+are stored for on-going authentication. As the assigned owner of a key you may 
+remove them at any time, but this may affect any existing services you have 
+setup.</p>
 {% if eveaccounts %}
 <table>
 <thead>
diff --git a/templates/registration/activate.html b/templates/registration/activate.html
index 7999340..6befc24 100644
--- a/templates/registration/activate.html
+++ b/templates/registration/activate.html
@@ -6,7 +6,7 @@
     Thank you for registering!<br />
     From now on, you can login with your username ({{ username }}).<br/>
     <br/>
-    <a href="{% url dreddit.views.index %}">Back</a>
+    <a href="{% url sso.views.index %}">Back</a>
     {% endwith %}
     </p>
 {% else %}
diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt
index 472918a..f4aa748 100644
--- a/templates/registration/activation_email.txt
+++ b/templates/registration/activation_email.txt
@@ -10,4 +10,4 @@ In case you didn't register, please ignore this Mail. The account will be delete
 Regards, 
 
 Matalok
-Mumble Admin
+Auth Gateway Admin
diff --git a/templates/registration/activation_email_subject.txt b/templates/registration/activation_email_subject.txt
index 5af014e..6044b1c 100644
--- a/templates/registration/activation_email_subject.txt
+++ b/templates/registration/activation_email_subject.txt
@@ -1 +1 @@
-Account verification
+Dreddit Auth Gateway Account Validation
diff --git a/templates/registration/profile.html b/templates/registration/profile.html
deleted file mode 100644
index 353aec3..0000000
--- a/templates/registration/profile.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{% load i18n %}
-
-{% block Content %}
-<h2 class="profile">{% blocktrans with user|capfirst as username %}Profile of {{username}}{% endblocktrans %}</h2>
-
-<table border=1>
-<tr><td>Service</td><td>Server</td><td>Status</td><td>Login</td><td>Other</td></tr>
-
-{% if mumbleacc %}
-<tr><td>Mumble</td><td>mumble.dredd.it</td><td>Active</td><td>{{ mumbleacc.name }}</td><td><a href="{% url dreddit.views.delete_mumble %}">Delete</a></td></tr>
-{% else %}
-<tr><td>Mumble</td><td>mumble.dredd.it</td><td>Inactive</td><td>N/A</td>
-{% if eveapi %}
-<td> <a href="{% url dreddit.views.add_mumble %}">Create Mumble Login</a></td>
-{% else %}
-<td</td>
-{% endif %}
-</tr>
-{% endif %}
-
-{% if corpaccess %}
-<tr><td>Jabber</td><td>jabber.dredd.it</td><td>Active</td><td>{{ user.username }}@dredd.it</td><td></td></tr>
-{% else %}
-<tr><td>Jabber</td><td>jabber.dredd.it</td><td>Inactive</td><td></td><td></td></tr>
-{% endif %}
-
-{% if corpaccess %}
-<tr><td>Wiki</td><td>wiki.dredd.it</td><td>Active</td><td>{{ user.username }}</td><td></td></tr>
-{% else %}
-<tr><td>Wiki</td><td>wiki.dredd.it</td><td>Inactive</td><td></td><td></td></tr>
-{% endif %}
-
-{% if corpaccess %}
-<tr><td>Forums</td><td>forum.dredd.it</td><td>Unkown</td><td>{{ user.username }}</td><td></td></tr>
-{% else %}
-<tr><td>Forums</td><td>forum.dredd.it</td><td>Unknown</td><td></td><td></td></tr>
-{% endif %}
-</table>
-
-
-<div class="profile">
-  <h4>EVE API Key</h4>
-{% if eveapi %}
-  <ul>
-     <li>User ID: {{ eveapi.api_user_id }}</li>
-     <li>Status: {{ apistatus }}</li>
-     <li>Corp Access: {{ corpaccess }}</li>
-     <li>Last API Update: {{ eveapi.api_last_updated }}</li>
-  </ul>
-  <a href="{% url dreddit.views.delete_eveapi %}">Delete EVE API Key</a>
-{% else %}
-  <a href="{% url dreddit.views.add_eveapi %}">Add EVE API key</a>
-{% endif %}
-
-</div>
-
-<div class="profile">
-  <h4>{% trans "Login Account" %}</h4>
-  <ul>
-    <li>{% trans "e-mail address" %}: {{ user.email }}</li>
-    <li>{% trans "staff status" %}: {{ user.is_staff|yesno }}</li>
-    <li>{% trans "date joined" %}: {{ user.date_joined|date }} {{ user.date_joined|time }}</li>
-    <li>{% trans "last login" %}: {{ user.last_login|date }} {{ user.last_login|time }}</li>
-    <li><a href="{% url django.contrib.auth.views.password_change %}">{% trans "Change password" %}</a></li>
-    <li><a href="{% url django.contrib.auth.views.logout %}">{% trans "Log out" %}</a></li>
-  </ul>
-</div>
-{% endblock %}
-
diff --git a/templates/sso/eveapi.html b/templates/sso/eveapi.html
index 014e268..06cc466 100644
--- a/templates/sso/eveapi.html
+++ b/templates/sso/eveapi.html
@@ -1,3 +1,7 @@
+<p>Please fill in your API key as provided on the <a
+href="http://eve-online.com/api">EVE Online API
+page</a></p>
+
 <form action="/profile/add/eveapi" method="post">
 {{ form.as_p }}
 <input type="submit" value="Submit" />