diff --git a/source/src/cube.h b/source/src/cube.h
index fee839b1..ace1036e 100644
--- a/source/src/cube.h
+++ b/source/src/cube.h
@@ -48,8 +48,8 @@ extern int verbose;
 #include "protos.h"				// external function decls
 
 #define AC_VERSION 1100
-#define AC_MASTER_URI "ac.if.usp.br" // test purposes
-#define AC_MASTER_PORT 28767
+#define AC_MASTER_URI "assault.cubers.net"
+#define AC_MASTER_PORT 28760
 
 #endif
 
diff --git a/source/src/protocol.h b/source/src/protocol.h
index 32665ca4..a6dde8dc 100644
--- a/source/src/protocol.h
+++ b/source/src/protocol.h
@@ -68,7 +68,7 @@ enum { HE_COMBO, HE_COMBO2, HE_COMBO3, HE_COMBO4, HE_COMBO5, HE_TEAMWORK, HE_FLA
 #define DNF 100.0f
 #define DVELF 4.0f
 
-enum { DISC_NONE = 0, DISC_EOP, DISC_CN, DISC_MKICK, DISC_MBAN, DISC_TAGT, DISC_BANREFUSE, DISC_WRONGPW, DISC_SOPLOGINFAIL, DISC_MAXCLIENTS, DISC_MASTERMODE, DISC_AUTOKICK, DISC_AUTOBAN, DISC_DUP, DISC_BADNICK, DISC_OVERFLOW, DISC_NUM };
+enum { DISC_NONE = 0, DISC_EOP, DISC_CN, DISC_MKICK, DISC_MBAN, DISC_TAGT, DISC_BANREFUSE, DISC_WRONGPW, DISC_SOPLOGINFAIL, DISC_MAXCLIENTS, DISC_MASTERMODE, DISC_AUTOKICK, DISC_AUTOBAN, DISC_DUP, DISC_BADNICK, DISC_OVERFLOW, DISC_ABUSE, DISC_NUM };
 
 #define EXT_ACK                         -1
 #define EXT_VERSION                     104
diff --git a/source/src/server.cpp b/source/src/server.cpp
index e3a43dbd..bcd097ec 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -2020,7 +2020,7 @@ void senddisconnectedscores(int cn)
 
 const char *disc_reason(int reason)
 {
-    static const char *disc_reasons[] = { "normal", "end of packet", "client num", "kicked by server operator", "banned by server operator", "tag type", "connection refused due to ban", "wrong password", "failed admin login", "server FULL", "server mastermode is \"private\"", "auto kick - did your score drop below the threshold?", "auto ban - did your score drop below the threshold?", "duplicate connection", "inappropriate nickname", "overflow" };
+    static const char *disc_reasons[] = { "normal", "end of packet", "client num", "kicked by server operator", "banned by server operator", "tag type", "connection refused due to ban", "wrong password", "failed admin login", "server FULL", "server mastermode is \"private\"", "auto kick - did your score drop below the threshold?", "auto ban - did your score drop below the threshold?", "duplicate connection", "inappropriate nickname", "overflow", "abuse - did you spammed too much?" };
     return reason >= 0 && (size_t)reason < sizeof(disc_reasons)/sizeof(disc_reasons[0]) ? disc_reasons[reason] : "unknown";
 }
 
@@ -2430,7 +2430,7 @@ void process(ENetPacket *packet, int sender, int chan)
                                 cl->name, team_string(cl->team), text, canspeech ? "SPAM detected" : "Forbidden speech");
                         if (canspeech) {
                             sendservmsg("\f3please do not spam", sender);
-                            if ( cl->spamcount > SPAMMAXREPEAT + 2 ) disconnect_client(cl->clientnum, DISC_AUTOKICK);
+                            if ( cl->spamcount > SPAMMAXREPEAT + 2 ) disconnect_client(cl->clientnum, DISC_ABUSE);
                         }
                         else {
                             sendservmsg("\f3watch your language!", sender);
@@ -2470,7 +2470,7 @@ void process(ENetPacket *packet, int sender, int chan)
                                 cl->name, text, canspeech ? "SPAM detected" : "Forbidden speech");
                         if (canspeech) {
                             sendservmsg("\f3please do not spam", sender);
-                            if ( cl->spamcount > SPAMMAXREPEAT + 2 ) disconnect_client(cl->clientnum, DISC_AUTOKICK);
+                            if ( cl->spamcount > SPAMMAXREPEAT + 2 ) disconnect_client(cl->clientnum, DISC_ABUSE);
                         }
                         else {
                             sendservmsg("\f3watch your language!", sender);
diff --git a/source/src/serveractions.h b/source/src/serveractions.h
index 879e4246..7b150d4a 100644
--- a/source/src/serveractions.h
+++ b/source/src/serveractions.h
@@ -30,7 +30,7 @@ void kick_abuser(int cn, int &cmillis, int &count, int limit)
         if ( count <= 0 ) count = 1;
     }
     cmillis = servmillis;
-    if( count >= limit ) disconnect_client(cn, DISC_AUTOKICK);
+    if( count >= limit ) disconnect_client(cn, DISC_ABUSE);
 }
 
 bool mapisok(mapstats *ms)