diff --git a/chat/pom.xml b/chat/pom.xml
index c2f4ad0..d541f55 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -82,10 +82,10 @@
                         <!-- Default configuration for running with: mvn clean javafx:run -->
                         <id>default-cli</id>
                         <configuration>
-                            <mainClass>rtgre.chat/rtgre.chat.ChatApplication</mainClass>
+                            <mainClass>rtgre.chat/rtgre.ChatLauncher</mainClass>
                             <launcher>app</launcher>
-                            <jlinkZipName>app</jlinkZipName>
-                            <jlinkImageName>app</jlinkImageName>
+                            <jlinkZipName>chatapp</jlinkZipName>
+                            <jlinkImageName>chatapp</jlinkImageName>
                             <noManPages>true</noManPages>
                             <stripDebug>true</stripDebug>
                             <noHeaderFiles>true</noHeaderFiles>
diff --git a/chat/src/main/java/rtgre/ChatLauncher.java b/chat/src/main/java/rtgre/ChatLauncher.java
new file mode 100644
index 0000000..c22c2aa
--- /dev/null
+++ b/chat/src/main/java/rtgre/ChatLauncher.java
@@ -0,0 +1,26 @@
+package rtgre;
+
+import rtgre.chat.ChatApplication;
+import rtgre.server.ChatServer;
+
+import java.io.IOException;
+
+public class ChatLauncher {
+    public static void main(String[] args) {
+        for (String arg : args) {
+            System.out.println(arg);
+        }
+        try {
+            if ("server".equals(args[0])) {
+                System.out.println("test1");
+                ChatServer.main(args);
+            } else {
+                ChatApplication.main(args);
+            }
+        } catch (Exception e) {
+            System.out.println("test2");
+            ChatApplication.main(args);
+        }
+
+    }
+}