diff --git a/src/sbbs3/sbbs_ini.c b/src/sbbs3/sbbs_ini.c
index d8218fde495a6c1dabe2f5556e73068097dc9b2b..7392ec44b753b6137d0798624565cd742f0d974f 100644
--- a/src/sbbs3/sbbs_ini.c
+++ b/src/sbbs3/sbbs_ini.c
@@ -107,12 +107,6 @@ void sbbs_read_ini(
 	}
 
 	host_name=iniReadString(fp,section,"HostName",nulstr);
-	if(*host_name) {
-		SAFECOPY(bbs->host_name,host_name);
-		SAFECOPY(ftp->host_name,host_name);
-		SAFECOPY(mail->host_name,host_name);
-		SAFECOPY(services->host_name,host_name);
-	}
 																		
 	/***********************************************************************/
 	section = "BBS";
@@ -147,6 +141,9 @@ void sbbs_read_ini(
 	default_term="pc3";
 #endif
 
+	SAFECOPY(bbs->host_name
+		,iniReadString(fp,section,"HostName",host_name));
+
 	SAFECOPY(bbs->xtrn_term
 		,iniReadString(fp,section,"ExternalTerm",default_term));
 
@@ -178,6 +175,9 @@ void sbbs_read_ini(
 	ftp->js_max_bytes
 		=iniReadInteger(fp,section,"JavaScriptMaxBytes",0);
 
+	SAFECOPY(ftp->host_name
+		,iniReadString(fp,section,"HostName",host_name));
+
 	SAFECOPY(ftp->index_file_name
 		,iniReadString(fp,section,"IndexFileName","00index"));
 	SAFECOPY(ftp->html_index_file
@@ -223,6 +223,9 @@ void sbbs_read_ini(
 	mail->max_recipients
 		=iniReadShortInt(fp,section,"MaxRecipients",100);
 
+	SAFECOPY(mail->host_name
+		,iniReadString(fp,section,"HostName",host_name));
+
 	SAFECOPY(mail->relay_server
 		,iniReadString(fp,section,"RelayServer",mail->relay_server));
 	SAFECOPY(mail->dns_server
@@ -259,6 +262,9 @@ void sbbs_read_ini(
 	services->js_max_bytes
 		=iniReadInteger(fp,section,"JavaScriptMaxBytes",0);
 
+	SAFECOPY(services->host_name
+		,iniReadString(fp,section,"HostName",host_name));
+
 	SAFECOPY(services->cfg_file
 		,iniReadString(fp,section,"ConfigFile",nulstr));