diff --git a/debian/changelog b/debian/changelog
index 5e2ed51..d71aad6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 cm4all-myproxy (0.17) unstable; urgency=low
 
-  * 
+  * quote client-specified strings for logging
 
  --   
 
diff --git a/src/Connection.cxx b/src/Connection.cxx
index 8efb5cf..725d8e0 100644
--- a/src/Connection.cxx
+++ b/src/Connection.cxx
@@ -237,7 +237,7 @@ Connection::OnHandshakeResponse(uint_least8_t sequence_id,
 
 	incoming.capabilities &= packet.capabilities;
 
-	fmt::print("[{}] login user='{}' database='{}'\n", GetName(), packet.user, packet.database);
+	fmt::print("[{}] login user={:?} database={:?}\n", GetName(), packet.user, packet.database);
 
 	user = packet.user;
 	auth_response = packet.auth_response;
@@ -393,7 +393,7 @@ Connection::Outgoing::OnHandshake(uint_least8_t sequence_id,
 
 	peer.capabilities = packet.capabilities & connection.incoming.capabilities;
 
-	fmt::print("[{}] handshake server_version='{}'\n",
+	fmt::print("[{}] handshake server_version={:?}\n",
 		   connection.GetName(), packet.server_version);
 
 	auth_handler = Mysql::MakeAuthHandler(packet.auth_plugin_name, false);