diff --git a/source/src/server.cpp b/source/src/server.cpp
index 43d49444..9abbec03 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -1308,7 +1308,7 @@ void localconnect()
 void initserver(bool dedicated, int uprate, char *sdesc, char *ip, char *master, char *passwd, int maxcl, char *maprot, char *masterpwd) // EDIT: AH
 {
     serverpassword = passwd;
-    maxclients = maxcl;
+    maxclients = maxcl ? min(maxcl, MAXCLIENTS) : DEFAULTCLIENTS;
 	servermsinit(master ? master : "masterserver.cubers.net/cgi-bin/actioncube.pl/", sdesc, dedicated);
     
     if(isdedicated = dedicated)
diff --git a/source/src/serverutil.cpp b/source/src/serverutil.cpp
index 4a0a7a9e..818ae1a5 100644
--- a/source/src/serverutil.cpp
+++ b/source/src/serverutil.cpp
@@ -148,7 +148,7 @@ void fatal(char *s, char *o) { cleanupserver(); printf("servererror: %s\n", s);
 
 int main(int argc, char* argv[]) // EDIT: AH
 {
-    int uprate = 0, maxcl = 4;
+    int uprate = 0, maxcl = DEFAULTCLIENTS;
     char *sdesc = "", *ip = "", *master = NULL, *passwd = "", *maprot = "", *masterpwd = NULL;
     
     for(int i = 1; i<argc; i++)