diff --git a/.travis.yml b/.travis.yml
index 9fc6129b32..307aa40d55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,11 +41,10 @@ env:
     - DB_PASS="ragnarok"
     - PACKETDBVER=45
   matrix:
-  matrix:
-    - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no"
-    - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=no"
-    - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=yes"
-    - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=yes"
+    - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=no --enable_buildbot=yes"
+    - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=no --enable_buildbot=yes"
+    - CONFIGURE_FLAGS="--enable-prere=no --enable-vip=yes --enable_buildbot=yes"
+    - CONFIGURE_FLAGS="--enable-prere=yes --enable-vip=yes --enable_buildbot=yes"
 
 notifications:
   email: false
diff --git a/appveyor.yml b/appveyor.yml
index 30d955fa7e..b9cd111d12 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,24 +10,28 @@ environment:
   matrix:
   - VisualStudioVersion: 10.0
     Solution: rAthena-10.sln
+	Defines: "BUILDBOT"
   - VisualStudioVersion: 11.0
     Solution: rAthena-12.sln
+	Defines: "BUILDBOT"
   - VisualStudioVersion: 12.0
     Solution: rAthena-13.sln
+	Defines: "BUILDBOT"
   - VisualStudioVersion: 14.0
     Solution: rAthena-14.sln
+	Defines: "BUILDBOT"
   - VisualStudioVersion: 10.0
     Solution: rAthena-10.sln
-    Defines: PRERE
+    Defines: "BUILDBOT;PRERE"
   - VisualStudioVersion: 11.0
     Solution: rAthena-12.sln
-    Defines: PRERE
+    Defines: "BUILDBOT;PRERE"
   - VisualStudioVersion: 12.0
     Solution: rAthena-13.sln
-    Defines: PRERE
+    Defines: "BUILDBOT;PRERE"
   - VisualStudioVersion: 14.0
     Solution: rAthena-14.sln
-    Defines: PRERE
+    Defines: "BUILDBOT;PRERE"
 platform:
   - Win32
 configuration:
diff --git a/src/char/char.c b/src/char/char.c
index fd1b156667..28411eebd8 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -3190,7 +3190,8 @@ int do_init(int argc, char **argv)
 	char_sql_config_read(SQL_CONF_NAME);
 	msg_config_read(MSG_CONF_NAME_EN);
 
-	if (strcmp(charserv_config.userid, "s1")==0 && strcmp(charserv_config.passwd, "p1")==0) {
+	// Skip this check if the server is run with run-once flag
+	if (runflag!=CORE_ST_STOP && strcmp(charserv_config.userid, "s1")==0 && strcmp(charserv_config.passwd, "p1")==0) {
 		ShowWarning("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
 		ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n");
 		ShowNotice("And then change the user/password to use in conf/char_athena.conf (or conf/import/char_conf.txt)\n");