diff --git a/services/modules/mumble/auth_hooks.py b/services/modules/mumble/auth_hooks.py
index 44f4024d..d2fcf307 100644
--- a/services/modules/mumble/auth_hooks.py
+++ b/services/modules/mumble/auth_hooks.py
@@ -57,8 +57,8 @@ class MumbleService(ServicesHook):
         return render_to_string(self.service_ctrl_template, {
             'service_name': self.title,
             'urls': urls,
-            'service_url': 'mumble://' + self.service_url,
-            'connect_url': 'mumble://' + str(request.user.mumble.username + '@' + self.service_url if MumbleTasks.has_account(request.user) else self.service_url),
+            'service_url': self.service_url,
+            'connect_url': request.user.mumble.username + '@' + self.service_url if MumbleTasks.has_account(request.user) else self.service_url,
             'username': request.user.mumble.username if MumbleTasks.has_account(request.user) else '',
         }, request=request)
 
diff --git a/services/modules/mumble/templates/registered/mumble_service_ctrl.html b/services/modules/mumble/templates/registered/mumble_service_ctrl.html
index b668e110..e818b7db 100644
--- a/services/modules/mumble/templates/registered/mumble_service_ctrl.html
+++ b/services/modules/mumble/templates/registered/mumble_service_ctrl.html
@@ -1,7 +1,7 @@
 <tr>
     <td class="text-center">{{ service_name }}</td>
     <td class="text-center">{{ username }}</td>
-    <td class="text-center"><a href="{{ service_url }}">{{ service_url }}</a></td>
+    <td class="text-center"><a href="mumble://{{ service_url }}">{{ service_url }}</a></td>
     <td class="text-center">
         {% ifequal username "" %}
             <a href="{% url urls.auth_activate %}" title="Activate" class="btn btn-warning">
@@ -17,7 +17,7 @@
             <a href="{% url urls.auth_deactivate %}" title="Deactivate" class="btn btn-danger">
                 <span class="glyphicon glyphicon-remove"></span>
             </a>
-            <a  href="{{ connect_url }}" class="btn btn-success" title="Connect">
+            <a  href="mumble://{{ connect_url }}" class="btn btn-success" title="Connect">
                 <span class="glyphicon glyphicon-arrow-right"></span>
             </a>
         {% endifequal %}
diff --git a/services/modules/teamspeak3/templates/registered/teamspeak3_service_ctrl.html b/services/modules/teamspeak3/templates/registered/teamspeak3_service_ctrl.html
index 7ac4840b..775d6bf7 100644
--- a/services/modules/teamspeak3/templates/registered/teamspeak3_service_ctrl.html
+++ b/services/modules/teamspeak3/templates/registered/teamspeak3_service_ctrl.html
@@ -1,34 +1,27 @@
 {% load i18n %}
 
-<tr>
-    <th class="text-center">{% trans "Service" %}</th>
-    <th class="text-center">{% trans "Unique ID" %}</th>
-    <th class="text-center">PermissionKey</th>
-    <th class="text-center">{% trans "Action" %}</th>
-</tr>
 <tr>
     <td class="text-center">Teamspeak 3</td>
     <td class="text-center">{{ authinfo.teamspeak3_uid }}</td>
-    <td class="text-center">{{ authinfo.teamspeak3_perm_key }}</td>
+    <td class="text-center"><a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}">{{ TEAMSPEAK3_PUBLIC_URL }}</a></td>
     <td class="text-center">
         {% ifequal authinfo.teamspeak3_uid "" %}
-            <a href="{% url 'auth_activate_teamspeak3' %}" class="btn btn-warning">
+            <a href="{% url 'auth_activate_teamspeak3' %}" title="Activate" class="btn btn-warning">
                 <span class="glyphicon glyphicon-ok"></span>
             </a>
         {% else %}
-            <a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}"
-            title="{% trans "Quick Link" %}" class="btn btn-info">
-                <span class="glyphicon glyphicon-link"></span>
-            </a>
-            <a href="{% url 'auth_verify_teamspeak3' %}" class="btn btn-success" title="Verify">
+            <a href="{% url 'auth_verify_teamspeak3' %}" title="Verify Client ID" class="btn btn-success" title="Verify">
                 <span class="glyphicon glyphicon-log-in"></span>
             </a>
-            <a href="{% url 'auth_reset_teamspeak3_perm' %}" class="btn btn-primary">
+            <a href="{% url 'auth_reset_teamspeak3_perm' %}" title="Refresh Token" class="btn btn-primary">
                 <span class="glyphicon glyphicon-refresh"></span>
             </a>
-            <a href="{% url 'auth_deactivate_teamspeak3' %}" class="btn btn-danger">
+            <a href="{% url 'auth_deactivate_teamspeak3' %}" title="Deactivate" class="btn btn-danger">
                 <span class="glyphicon glyphicon-remove"></span>
             </a>
+            <a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?nickname={{ authinfo.teamspeak3_uid }}" title="Connect" class="btn btn-success">
+                <span class="glyphicon glyphicon-arrow-right"></span>
+            </a>
         {% endifequal %}
     </td>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/stock/templates/registered/services.html b/stock/templates/registered/services.html
index 11c358b3..98137c10 100755
--- a/stock/templates/registered/services.html
+++ b/stock/templates/registered/services.html
@@ -10,7 +10,7 @@
 {% block content %}
     <div class="col-lg-12">
     <h1 class="page-header text-center">{% trans "Available Services" %}</h1>
-        <table class="table table-bordered">
+        <table class="table table-hover">
             <tr>
                 <th class="text-center">{% trans "Service" %}</th>
                 <th class="text-center">{% trans "Username" %}</th>