diff --git a/FlippR-Driver/src/input/detail/EventNotifier.cpp b/FlippR-Driver/src/input/detail/EventNotifier.cpp
index d369343..3264259 100644
--- a/FlippR-Driver/src/input/detail/EventNotifier.cpp
+++ b/FlippR-Driver/src/input/detail/EventNotifier.cpp
@@ -43,12 +43,14 @@ void EventNotifier::register_event_handler(EventHandler *handler)
 {
   std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex);
   this->event_handlers.insert(handler);
+  CLOG(INFO, INPUT_LOGGER) << "New Eventhandler at adress " << handler << " was registered.";
 }
 
 void EventNotifier::unregister_event_handler(EventHandler *handler)
 {
   std::lock_guard<std::mutex> event_handler_guard(event_handler_mutex);
   this->event_handlers.erase(handler);
+  CLOG(INFO, INPUT_LOGGER) << "Eventhandler at adress " << handler << " was unregistered.";
 }
 
 void EventNotifier::distribute_event(const Event &event)
diff --git a/FlippR-Driver/src/input/detail/InputDriver.cpp b/FlippR-Driver/src/input/detail/InputDriver.cpp
index c8bd102..fb62c8e 100644
--- a/FlippR-Driver/src/input/detail/InputDriver.cpp
+++ b/FlippR-Driver/src/input/detail/InputDriver.cpp
@@ -24,13 +24,11 @@ event_notifier(std::move(event_notifier)), detector(std::move(detector)), events
 
 void InputDriver::register_event_handler(EventHandler *handler)
 {
-  CLOG(INFO, INPUT_LOGGER) << "New Eventhandler at adress " << handler << " was registered.";
   this->event_notifier->register_event_handler(handler);
 }
 
 void InputDriver::unregister_event_handler(EventHandler *handler)
 {
-  CLOG(INFO, INPUT_LOGGER) << "Eventhandler at adress " << handler << " was unregistered.";
   this->event_notifier->unregister_event_handler(handler);
 }