diff --git a/app/sso/templates/sso/apipassword.html b/app/sso/templates/sso/apipassword.html
index d582689..3b37ca3 100644
--- a/app/sso/templates/sso/apipassword.html
+++ b/app/sso/templates/sso/apipassword.html
@@ -8,8 +8,9 @@
   <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>
+<p>Your Services Password allows you to login to various TEST services and other third party services (such as the Betting Emporium). It is highly recommend that you setup a password as soon as you create your Auth account.</p> 
+
+<p>Please use a different password from your normal auth password, as this is inherently less secure due to the multiple applications using it.</p>
 
 <form action="{% url sso-apipassword %}" method="post">
 <fieldset>
diff --git a/app/sso/views.py b/app/sso/views.py
index 1b6d479..a0be44a 100644
--- a/app/sso/views.py
+++ b/app/sso/views.py
@@ -39,6 +39,9 @@ class ProfileView(LoginRequiredMixin, TemplateView):
 
     def get(self, request, *args, **kwargs):
         self.profile = self.get_profile(request.user)
+        if self.profile.api_service_password is None or self.profile.api_service_password == '':
+            messages.info(request, "Please set a External Services Password before continuing.")
+            return HttpResponseRedirect(reverse('sso-apipassword'))
         if self.profile.primary_character is None and EVEPlayerCharacter.objects.filter(eveaccount__user=request.user).count():
             return HttpResponseRedirect(reverse('sso-primarycharacterupdate'))
         return super(ProfileView, self).get(request, *args, **kwargs)