diff --git a/components/demo/democomponent.cpp b/components/demo/democomponent.cpp
index 2c9de30b0..2af4a1470 100644
--- a/components/demo/democomponent.cpp
+++ b/components/demo/democomponent.cpp
@@ -65,7 +65,7 @@ int DemoComponent::DemoTimerHandler(const TimerEventArgs& tea)
 
 int DemoComponent::HelloWorldRequestHandler(const NewRequestEventArgs& nrea)
 {
-	Application::Log("Got 'hello world' from address:" + nrea.Sender->GetAddress() + ", identity:" + nrea.Sender->GetIdentity());
+	Application::Log("Got 'hello world' from address=" + nrea.Sender->GetAddress() + ", identity=" + nrea.Sender->GetIdentity());
 
 	return 0;
 }
diff --git a/icinga/jsonrpcendpoint.cpp b/icinga/jsonrpcendpoint.cpp
index 1b56009d5..160305482 100644
--- a/icinga/jsonrpcendpoint.cpp
+++ b/icinga/jsonrpcendpoint.cpp
@@ -137,8 +137,7 @@ int JsonRpcEndpoint::NewMessageHandler(const NewMessageEventArgs& nmea)
 
 int JsonRpcEndpoint::ClientClosedHandler(const EventArgs& ea)
 {
-	string address = GetAddress();
-	Application::Log("Lost connection to endpoint: " + address);
+	Application::Log("Lost connection to endpoint: identity=" + GetIdentity());
 
 	m_PendingCalls.clear();