diff --git a/src/main/java/org/example/ClientApp.java b/src/main/java/org/example/ClientApp.java
index 89ad2f7..20cced0 100644
--- a/src/main/java/org/example/ClientApp.java
+++ b/src/main/java/org/example/ClientApp.java
@@ -21,8 +21,11 @@ public class ClientApp extends JFrame {
     private Socket socket;
     private BufferedReader in;
     private PrintWriter out;
+    private String clientName;
+
+    public ClientApp(String name) {
+        this.clientName = name;
 
-    public ClientApp() {
         setTitle("Chat Client");
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         setSize(400, 300);
@@ -73,7 +76,7 @@ public class ClientApp extends JFrame {
                 try {
                     String serverMessage;
                     while ((serverMessage = in.readLine()) != null) {
-                        chatArea.append("Server: " + serverMessage + "\n");
+                        chatArea.append(serverMessage + "\n");
                     }
                 } catch (IOException e) {
                     e.printStackTrace();
@@ -94,7 +97,7 @@ public class ClientApp extends JFrame {
     private void sendMessage() {
         String message = messageField.getText().trim();
         if (!message.isEmpty()) {
-            out.println(message);
+            out.println(clientName + ": " + message);
             messageField.setText("");
             chatArea.append("You: " + message + "\n");
         }
@@ -104,7 +107,7 @@ public class ClientApp extends JFrame {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                new ClientApp();
+                new ClientApp(args[0]);
             }
         });
     }
diff --git a/src/main/java/org/example/ServerApp.java b/src/main/java/org/example/ServerApp.java
index e15e428..801dfb9 100644
--- a/src/main/java/org/example/ServerApp.java
+++ b/src/main/java/org/example/ServerApp.java
@@ -61,7 +61,6 @@ public class ServerApp {
             try {
                 in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
                 out = new PrintWriter(clientSocket.getOutputStream(), true);
-
                 String clientMessage;
                 while ((clientMessage = in.readLine()) != null) {
                     broadcastMessage(clientMessage, this);