diff --git a/sso/views.py b/sso/views.py
index c9e55d2..82da4bc 100644
--- a/sso/views.py
+++ b/sso/views.py
@@ -107,17 +107,17 @@ def service_add(request):
             else:
                 error = None
 
-            return render_to_response('sso/serviceaccount_created.html', { 'account': acc, 'error': error }) 
+            return render_to_response('sso/serviceaccount/created.html', { 'account': acc, 'error': error })
     else:
         #defaults = { 'username': request.user.username, 'password': request.user.get_profile().default_service_passwd }
 
         availserv = Service.objects.filter(groups__in=request.user.groups.all()).exclude(id__in=ServiceAccount.objects.filter(user=request.user).values('service'))
         if len(availserv) == 0:
-            return HttpResponseRedirect(reverse('sso.views.profile'))
+            return render_to_response('sso/serviceaccount/noneavailable.html')
         else: 
             form = clsform() # An unbound form
 
-    return render_to_response('sso/serviceaccount.html', locals())
+    return render_to_response('sso/serviceaccount/index.html', locals())
 
 @login_required
 def service_del(request, serviceid=0):
@@ -143,13 +143,13 @@ def service_reset(request, serviceid=0, accept=0):
 
         if acc.user == request.user:
             if not accept:
-                return render_to_response('sso/serviceaccount_reset.html', locals())
+                return render_to_response('sso/serviceaccount/reset.html', locals())
 
             passwd = hashlib.sha1('%s%s' % (acc.service_uid, settings.SECRET_KEY)).hexdigest()
 
             api = acc.service.api_class
             api.enable_user(acc.service_uid, passwd)
-            return render_to_response('sso/serviceaccount_resetcomplete.html', locals())
+            return render_to_response('sso/serviceaccount/resetcomplete.html', locals())
 
     return HttpResponseRedirect(reverse('sso.views.profile'))
 
diff --git a/templates/profile.html b/templates/sso/profile.html
similarity index 100%
rename from templates/profile.html
rename to templates/sso/profile.html
diff --git a/templates/sso/serviceaccount_created.html b/templates/sso/serviceaccount/created.html
similarity index 100%
rename from templates/sso/serviceaccount_created.html
rename to templates/sso/serviceaccount/created.html
diff --git a/templates/sso/serviceaccount.html b/templates/sso/serviceaccount/index.html
similarity index 100%
rename from templates/sso/serviceaccount.html
rename to templates/sso/serviceaccount/index.html
diff --git a/templates/sso/serviceaccount/noneavailable.html b/templates/sso/serviceaccount/noneavailable.html
new file mode 100644
index 0000000..525d7d2
--- /dev/null
+++ b/templates/sso/serviceaccount/noneavailable.html
@@ -0,0 +1,9 @@
+% extends "base.html" %}
+
+{% block title %}Service Account{% endblock %}
+
+{% block content %}
+<p>You have no services available to add to your account</p>
+
+<p><a href="/profile">Return to your Profile</a></p>
+{% endblock %}
diff --git a/templates/sso/serviceaccount_reset.html b/templates/sso/serviceaccount/reset.html
similarity index 100%
rename from templates/sso/serviceaccount_reset.html
rename to templates/sso/serviceaccount/reset.html
diff --git a/templates/sso/serviceaccount_resetcomplete.html b/templates/sso/serviceaccount/resetcomplete.html
similarity index 100%
rename from templates/sso/serviceaccount_resetcomplete.html
rename to templates/sso/serviceaccount/resetcomplete.html