diff --git a/backend/service-authentication/server.js b/backend/service-authentication/server.js
index a15ce7a..8c6812d 100644
--- a/backend/service-authentication/server.js
+++ b/backend/service-authentication/server.js
@@ -10,7 +10,7 @@ app.use(bodyParser.urlencoded({extended:true}));
 app.use(bodyParser.json());
 
 const cors = require('cors');
-app.use(cors({origin: 'http://127.0.0.1:4200', credentials: true}));
+app.use(cors({origin: 'http://frontend:4200', credentials: true}));
 
 const mongoConnect = require('./mongodbConnect');
 
diff --git a/backend/service-message/server.js b/backend/service-message/server.js
index 3c54fc3..8e8508e 100644
--- a/backend/service-message/server.js
+++ b/backend/service-message/server.js
@@ -35,18 +35,15 @@ io.on('connection',socket => {
     const session = auth.getSession(socket.request);
     const getUsername = auth.getUsername(session);
 
-    console.log(getUsername);
-
-    socket.on('user', (userData) => {
-        console.log(`${getUsername} joined the chat.`);
-        users[socket.id] = getUsername;
-        messages.find({},(err, res) => {
-            if(err) throw err;
-            if(res.length > 0){
-                const savedChat = res;
-                socket.emit('general',savedChat);
-            }
-        });
+    console.log(`${getUsername} joined the chat.`);
+    socket.broadcast.emit('general',`${getUsername} joined the chat.`);
+    users[socket.id] = getUsername;
+    messages.find({},(err, res) => {
+        if(err) throw err;
+        if(res.length > 0){
+            const savedChat = res;
+            socket.emit('general',savedChat);
+        }
     });
 
     socket.on('general',function(data){