diff --git a/maloja/apis/audioscrobbler.py b/maloja/apis/audioscrobbler.py
index a7219ef..586f2c5 100644
--- a/maloja/apis/audioscrobbler.py
+++ b/maloja/apis/audioscrobbler.py
@@ -55,7 +55,8 @@ class Audioscrobbler(APIHandler):
 				raise InvalidAuthException()
 		# or username and token (deprecated by lastfm)
 		elif user is not None and token is not None:
-			for client,key in apikeystore:
+			for client in apikeystore:
+				key = apikeystore[client]
 				if md5(user + md5(key)) == token:
 					sessionkey = self.generate_key(client)
 					return 200,{"session":{"key":sessionkey}}
diff --git a/maloja/apis/audioscrobbler_legacy.py b/maloja/apis/audioscrobbler_legacy.py
index 4a01a58..322fe78 100644
--- a/maloja/apis/audioscrobbler_legacy.py
+++ b/maloja/apis/audioscrobbler_legacy.py
@@ -42,10 +42,9 @@ class AudioscrobblerLegacy(APIHandler):
 		protocol = 'http' if (keys.get("u") == 'nossl') else request.urlparts.scheme
 
 		if auth is not None:
-			for identifier in apikeystore:
-				key = apikeystore[identifier]
-				client = self.check_token(auth,key,timestamp)
-				if client:
+			for client in apikeystore:
+				key = apikeystore[client]
+				if self.check_token(auth,key,timestamp):
 					sessionkey = self.generate_key(client)
 					return 200, (
 						"OK\n"