diff --git a/makefile b/makefile
index d15046187deb7791521995544090947800f7b8a1..cd398ec9ccdb86751d95f329cffbc37980380376 100644
--- a/makefile
+++ b/makefile
@@ -32,6 +32,9 @@ run: compile
 run-debug: compile
 	mvn exec:java@run-debug
 
+run-single:
+	java -jar target/caosdb-server-0.1-SNAPSHOT-jar-with-dependencies.jar
+
 compile: easy-units
 	mvn compile
 
diff --git a/src/main/java/caosdb/server/CaosDBServer.java b/src/main/java/caosdb/server/CaosDBServer.java
index 89ff1b71a1f47183e5b994342cd7171da4ef9486..0be5a6e2543cf5b0e50c8032c501fc0a12f145b2 100644
--- a/src/main/java/caosdb/server/CaosDBServer.java
+++ b/src/main/java/caosdb/server/CaosDBServer.java
@@ -207,17 +207,21 @@ public class CaosDBServer extends Application {
   }
 
   private static void init(final String[] args) {
+    // Important change:
+    // Make silent the default option
+    START_GUI = false;
     for (final String s : args) {
       if (s.equals("silent")) {
         START_GUI = false;
+      } else if (s.equals("gui")) {
+        START_GUI = true;
       } else if (s.equals("nobackend")) {
         START_BACKEND = false;
       } else if (s.equals("insecure")) {
         INSECURE = true;
       }
-
-      DEBUG_MODE = Boolean.getBoolean("caosdb.debug");
     }
+    DEBUG_MODE = Boolean.getBoolean("caosdb.debug");
   }
 
   /**