diff --git a/dist/config/bbs.ini b/dist/config/bbs.ini
index 2ad1d3c..4b91ba9 100644
--- a/dist/config/bbs.ini
+++ b/dist/config/bbs.ini
@@ -29,6 +29,8 @@ MQTT Enable = false
 MQTT Port = 2027
 MQTT Address = localhost
 MQTT Topic = MagickaBBS
+; MQTT User = username
+; MQTT Pass = secretpassword
 IP Guard Enable = true
 IP Guard Timeout = 120
 IP Guard Tries = 4
diff --git a/docs/docs/guide/ini/bbs.md b/docs/docs/guide/ini/bbs.md
index 6489357..9968e7d 100644
--- a/docs/docs/guide/ini/bbs.md
+++ b/docs/docs/guide/ini/bbs.md
@@ -29,9 +29,12 @@ This is the main bbs INI file and contains the following sections
  * **QWK Name** Name used for the system for Bluewave (Required - restricted to 8 characters)
  * **Main AKA** Your main network address (Required)
  * **QWK Max Messages** Maximum number of messages per Bluewave bundle (Required)
- * **Broadcast Enable** Set to true to enable the Broadcast Feature (Required)
- * **Broadcast Port** The port to send broadcast messages on (Required)
- * **Broadcast Address** The address to broadcast on (Required)
+ * **MQTT Enable** Enables / Disables MQTT Messages (Required)
+ * **MQTT Port** Port that your MQTT server listens on (Required if MQTT Enabled)
+ * **MQTT Address** Address of your MQTT server (Required if MQTT Enabled)
+ * **MQTT Topic** Topic your BBS publishes to (Required if MQTT Enabled)
+ * **MQTT User** Username to login to your MQTT server (Optional)
+ * **MQTT Pass** Password to login to your MQTT server (Optional)
  * **IP Guard Enable** Set to true to enable the IP Guard (Required)
  * **IP Guard Timeout** Timeout between connections (Required)
  * **IP Guard Tries** Number of connections allowed within IP Guard Timeout (Required)
diff --git a/src/bbs.c b/src/bbs.c
index b58e965..f14d671 100644
--- a/src/bbs.c
+++ b/src/bbs.c
@@ -948,7 +948,7 @@ void runbbs_real(int socket, char *ip, int ssh) {
 	} else {
 		sshBBS = 1;
 	}
-	broadcast("USER: unknown; NODE:%d; STATUS: Logging in.", mynode);
+	
 	s_printf("Magicka BBS v%d.%d (%s), Loading...\r\n", VERSION_MAJOR, VERSION_MINOR, VERSION_STR);
 
 	// find out which node we are
@@ -977,6 +977,8 @@ void runbbs_real(int socket, char *ip, int ssh) {
 		}
 		exit(1);
 	}
+	
+	broadcast("USER: unknown; NODE:%d; STATUS: Logging in.", mynode);
 
 	dolog("Incoming %s connection on node %d", (ssh ? "SSH" : "Telnet"), mynode);