diff --git a/tools/token-handler.cr b/tools/token-handler.cr
index 4a138dc..119edca 100644
--- a/tools/token-handler.cr
+++ b/tools/token-handler.cr
@@ -13,13 +13,8 @@ dnsmanagerd = DNSManager::Client.new
 #dnsmanagerd.login login, pass
 
 server = HTTP::Server.new do |context|
-	pp! context.request.remote_address
-	ip = case remote = context.request.remote_address
-	when Socket::IPAddress
-		remote.address
-	else
-		""
-	end
+	pp! context.request.headers["Host"]
+	ip = context.request.headers["Host"] rescue next
 
 	case context.request.path
 	when /^\/token-update\/(?<token>[a-z0-9-]+)/