diff --git a/services/views.py b/services/views.py
index efaf7545..d2a7b230 100755
--- a/services/views.py
+++ b/services/views.py
@@ -340,12 +340,32 @@ def activate_teamspeak3(request):
     if result[0] is not "":
         AuthServicesInfoManager.update_user_teamspeak3_info(result[0], result[1], request.user)
         logger.debug("Updated authserviceinfo for user %s with TS3 credentials. Updating groups." % request.user)
-        update_teamspeak3_groups.delay(request.user.pk)
         logger.info("Succesfully activated TS3 for user %s" % request.user)
-        return HttpResponseRedirect("/services/")
+        return HttpResponseRedirect("/verify_teamspeak3/")
     logger.error("Unsuccessful attempt to activate TS3 for user %s" % request.user)
     return HttpResponseRedirect("/dashboard")
 
+@login_required
+@user_passes_test(service_blue_alliance_test)
+def verify_teamspeak3(request):
+    logger.debug("verify_teamspeak3 called by user %s" % request.user)
+    authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
+    if not authinfo.teamspeak3_uid:
+        logger.warn("Unable to validate user %s teamspeak: no teamspeak data" % request.user)
+        return HttpResponseRedirect("/services")
+    if request.method == "POST":
+        form = TeamspeakJoinForm(request.POST)
+        if form.is_valid():
+            update_teamspeak3_groups.delay(request.user.pk)
+            logger.debug("Validated user %s joined TS server")
+            return HttpResponseRedirect("/services/")
+    else:
+        form = TeamspeakJoinForm({'username':authinfo.teamspeak3_uid})
+    context = {
+        'form': form,
+        'authinfo': authinfo,
+    }
+    return render_to_response('registered/teamspeakjoin.html', context, context_instance=RequestContext(request))
 
 @login_required
 @user_passes_test(service_blue_alliance_test)
diff --git a/stock/templates/registered/services.html b/stock/templates/registered/services.html
index b1a4bd63..acef85db 100755
--- a/stock/templates/registered/services.html
+++ b/stock/templates/registered/services.html
@@ -130,6 +130,33 @@
                     </td>
                 </tr>
             {% endif %}
+            {% if ENABLE_BLUE_IPS4 %}
+                <td class="text-center">IPS4</td>
+                <td class="text-center">{{ authinfo.ips4_username }}</td>
+                <td class="text-center">{{ authinfo.ips4_password }}</td>
+                <td class="text-center"><a href="{{ IPS4_URL }}">{{ IPS4_URL }}</a></td>
+                <td class="text-center">
+                    {% ifequal authinfo.ips4_username "" %}
+                        <a href="{% url 'auth_activate_ips4' %}">
+                            <button type="button" class="btn btn-warning"><span
+                                    class="glyphicon glyphicon-ok"></span></button>
+                        </a>
+                    {% else %}
+                        <a href="{% url 'auth_set_ips4_password' %}">
+                            <button type="button" class="btn btn-warning"><span
+                                    class="glyphicon glyphicon-pencil"></span></button>
+                        </a>
+                        <a href="{% url 'auth_reset_ips4_password' %}">
+                            <button type="button" class="btn btn-primary"><span
+                                    class="glyphicon glyphicon-refresh"></span></button>
+                        </a>
+                        <a href="{% url 'auth_deactivate_ips4' %}">
+                            <button type="button" class="btn btn-danger"><span
+                                    class="glyphicon glyphicon-remove"></span></button>
+                        </a>
+                    {% endifequal %}
+                </td>
+            {% endif %}
             {% if ENABLE_BLUE_DISCORD %}
                 <tr>
                     <td class="text-center">Discord</td>