diff --git a/maloja/database.py b/maloja/database.py
index 34cdcfc..3fa840f 100644
--- a/maloja/database.py
+++ b/maloja/database.py
@@ -107,7 +107,7 @@ def add_known_server(url):
 log("Authenticated Machines: " + ", ".join([k for k in apikeystore]))
 
 def checkAPIkey(key):
-	return any((key == apikeystore[k]) for k in apikeystore)
+	return apikeystore.check_key(key)
 
 def allAPIkeys():
 	return [apikeystore[k] for k in apikeystore]
diff --git a/maloja/web/jinja/abstracts/admin.jinja b/maloja/web/jinja/abstracts/admin.jinja
index 0e0a271..9096375 100644
--- a/maloja/web/jinja/abstracts/admin.jinja
+++ b/maloja/web/jinja/abstracts/admin.jinja
@@ -16,36 +16,22 @@
 				<h1>Admin Panel</h1>
 				<br/>
 				<span>
-					{% if page=='admin_overview' %}
-						<span style="opacity:0.5;">Overview</span>
-					{% else %}
-						<a href="/admin_overview">Overview</a>
-					{% endif %} |
-					{% if page=='admin_setup' %}
-						<span style="opacity:0.5;">Server Setup</span>
-					{% else %}
-						<a href="/admin_setup">Server Setup</a>
-					{% endif %} |
-					{% if page=='admin_manual' %}
-						<span style="opacity:0.5;">Manual Scrobbling</span>
-					{% else %}
-						<a href="/admin_manual">Manual Scrobbling</a>
-					{% endif %} |
-					{% if page=='admin_issues' %}
-						<span style="opacity:0.5;">Database Maintenance</span>
-					{% else %}
-						<a href="/admin_issues">Database Maintenance</a>
-					{% endif %} |
-					{% if page=='admin_settings' %}
-						<span style="opacity:0.5;">Settings</span>
-					{% else %}
-						<a href="/admin_settings">Settings</a>
-					{% endif %} |
-					{% if page=='admin_apikeys' %}
-					   <span style="opacity:0.5;">API Keys</span>
-				   {% else %}
-					   <a href="/admin_apikeys">API Keys</a>
-				   {% endif %}
+					{% for tab_url,tab_name in [
+						['overview','Overview'],
+						['setup','Setup'],
+						['manual','Manual Scrobbling'],
+						['issues','Database Maintenance'],
+						['settings','Settings'],
+						['apikeys','API Keys']
+					] %}
+						{% if page=='admin_' + tab_url %}
+							<span style="opacity:0.5;">{{ tab_name }}</span>
+						{% else %}
+							<a href="/admin_{{ tab_url }}">{{ tab_name }}</a>
+						{% endif %} {%- if not loop.last %}|{% endif %}
+					{% endfor %}
+
+
 				</span>
 				<br/><br/>
 				<span id="notification"></span>