diff --git a/maloja/apis/audioscrobbler_legacy.py b/maloja/apis/audioscrobbler_legacy.py
index 7f031231..7581478d 100644
--- a/maloja/apis/audioscrobbler_legacy.py
+++ b/maloja/apis/audioscrobbler_legacy.py
@@ -46,6 +46,9 @@ def handshake(self,pathnodes,keys):
 				key = apikeystore[client]
 				if self.check_token(auth,key,timestamp):
 					sessionkey = self.generate_key(client)
+					if ':' not in host:
+						port = 80 if protocol == 'http' else 443
+						host = f"{host}:{port}"
 					return 200, (
 						"OK\n"
 						f"{sessionkey}\n"
@@ -109,7 +112,7 @@ def generate_key(self,client):
 		    str(
 		        random.choice(
 		            list(range(10)) + list("abcdefghijklmnopqrstuvwxyz") +
-		            list("ABCDEFGHIJKLMNOPQRSTUVWXYZ"))) for _ in range(64))
+		            list("ABCDEFGHIJKLMNOPQRSTUVWXYZ"))) for _ in range(32))
 
 		self.mobile_sessions[key] = client
 		return key