diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java b/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java
index 79246dfb9..75b417e1d 100644
--- a/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java
+++ b/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebInterfaceHandler.java
@@ -21,6 +21,8 @@
 import io.undertow.server.HttpServerExchange;
 
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import org.syncany.plugins.Plugins;
 import org.syncany.plugins.web.WebInterfacePlugin;
@@ -30,6 +32,7 @@
  *
  */
 public class InternalWebInterfaceHandler implements HttpHandler {
+	private static final Logger logger = Logger.getLogger(InternalWebInterfaceHandler.class.getSimpleName());
 	private List<WebInterfacePlugin> webInterfacePlugins;
 	private WebInterfacePlugin webInterfacePlugin;
 	private HttpHandler requestHandler;
@@ -47,6 +50,7 @@ private void initWebInterfacePlugin() {
 			webInterfacePlugin = webInterfacePlugins.iterator().next();
 			requestHandler = webInterfacePlugin.createRequestHandler();
 			
+			logger.log(Level.INFO, "Starting webInterfacePlugin: " + webInterfacePlugin.getId());
 			webInterfacePlugin.start();
 		}
 		catch (Exception e) {
@@ -65,6 +69,7 @@ public void handleRequest(HttpServerExchange exchange) throws Exception {
 	}
 
 	private void handleRequestWithResourceHandler(HttpServerExchange exchange) throws Exception {
+		logger.log(Level.FINE, "Sending request to webInterfacePlugin handler: " + exchange.toString());
 		requestHandler.handleRequest(exchange);
 	}
 
diff --git a/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java b/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java
index e9c0ffb0d..65d3b3df0 100644
--- a/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java
+++ b/syncany-daemon/src/main/java/org/syncany/operations/daemon/handlers/InternalWebSocketHandler.java
@@ -48,10 +48,12 @@ public class InternalWebSocketHandler implements WebSocketConnectionCallback {
 	public InternalWebSocketHandler(DaemonWebServer daemonWebServer) {
 		this.daemonWebServer = daemonWebServer;
 		eventBus = DaemonEventBus.getInstance();
+		eventBus.register(this);
 	}
 	
 	@Override
 	public void onConnect(WebSocketHttpExchange exchange, WebSocketChannel channel) {
+		logger.log(Level.INFO, "Connecting to websocket server.");
 		// Validate origin header (security!)
 		String originHeader = exchange.getRequestHeader("Origin");
 		boolean allowedOriginHeader = (originHeader == null || 
@@ -62,6 +64,8 @@ public void onConnect(WebSocketHttpExchange exchange, WebSocketChannel channel)
 			exchange.close();
 		}
 		else {
+			logger.log(Level.INFO, "Valid origin header, setting up connection.");
+			
 			channel.getReceiveSetter().set(new AbstractReceiveListener() {
 				@Override
 				protected void onFullTextMessage(WebSocketChannel clientChannel, BufferedTextMessage message) {