diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..30d74d2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+test
\ No newline at end of file
diff --git a/signalingserver/signaling_server.go b/signalingserver/signaling_server.go
index 6dcc528..7a19588 100644
--- a/signalingserver/signaling_server.go
+++ b/signalingserver/signaling_server.go
@@ -136,7 +136,7 @@ func (s *SignalingServer) HandleWebSocketConn(w http.ResponseWriter, r *http.Req
 			continue
 		}
 
-		if msg.Reach == message.Self {
+		if msg.Reach == message.Self || msg.PeerID == connID {
 			responseMsg.Sender = "server"
 		}
 
@@ -149,6 +149,7 @@ func (s *SignalingServer) HandleWebSocketConn(w http.ResponseWriter, r *http.Req
 				responseMsg.Kind = message.TextMessage
 				responseMsg.Content, err = json.Marshal(message.TextMessageContent{logMsg})
 				responseMsg.Reach = message.Self
+				responseMsg.Sender = "server"
 				if err != nil {
 					log.Println("Error marshaling error message")
 					continue