3 files changed, 12 insertions, 10 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index eda3a14e5..836f18acd 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -114,15 +114,6 @@ static int char_init_done = 0;
 void chrif_setuserid(char *id)
 {
 	memcpy(userid, id, NAME_LENGTH);
-	if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) {
-		ShowError("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
-#ifdef TXT_ONLY
-		ShowNotice("Please edit your save/account.txt file to create a proper inter-server user/password (gender 'S')\n");
-#else
-		ShowNotice("Please edit your 'login' table to create a proper inter-server user/password (gender 'S')\n");
-#endif
-		ShowNotice("and then edit your user/password in conf/map_athena.conf (or conf/import/map_conf.txt)\n");
-	}
 }
 
 /*==========================================
@@ -132,7 +123,15 @@ void chrif_setuserid(char *id)
 void chrif_setpasswd(char *pwd)
 {
 	memcpy(passwd, pwd, NAME_LENGTH);
-	if (strcmp(userid, "s1")==0 && strcmp(pwd, "p1")==0) {
+}
+
+/*==========================================
+ *
+ *------------------------------------------
+ */
+void chrif_checkdefaultlogin(void)
+{
+	if (strcmp(userid, "s1")==0 && strcmp(passwd, "p1")==0) {
 		ShowError("Using the default user/password s1/p1 is NOT RECOMMENDED.\n");
 #ifdef TXT_ONLY
 		ShowNotice("Please edit your save/account.txt file to create a proper inter-server user/password (gender 'S')\n");
@@ -143,6 +142,7 @@ void chrif_setpasswd(char *pwd)
 	}
 }
 
+
 /*==========================================
  *
  *------------------------------------------
diff --git a/src/map/chrif.h b/src/map/chrif.h
index 1be6d4182..c5d3950e3 100644
--- a/src/map/chrif.h
+++ b/src/map/chrif.h
@@ -14,6 +14,7 @@ struct auth_node{
 
 void chrif_setuserid(char*);
 void chrif_setpasswd(char*);
+void chrif_checkdefaultlogin(void);
 void chrif_setip(char*);
 void chrif_setport(int);
 
diff --git a/src/map/map.c b/src/map/map.c
index 920909279..4e77e9d23 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -3811,6 +3811,7 @@ int do_init(int argc, char *argv[]) {
 	}
 
 	map_config_read(MAP_CONF_NAME);
+	chrif_checkdefaultlogin();
 
 	if ((naddr_ == 0) && (map_ip_set_ == 0 || char_ip_set_ == 0)) {
 		ShowError("\nUnable to determine your IP address... please edit the map_athena.conf file and set it.\n");