diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp
index bd316d813e08ccce18e3f2ebfca68e0fb15c8017..cb2d56c6b21b6b3129335e68e8293a2f6244e73c 100644
--- a/src/sbbs3/main.cpp
+++ b/src/sbbs3/main.cpp
@@ -2880,6 +2880,10 @@ void DLLCALL bbs_thread(void* arg)
 		return;
 	}
 
+	/* Setup intelligent defaults */
+	if(startup->telnet_port==0)		startup->telnet_port=IPPORT_TELNET;
+	if(startup->rlogin_port==0)		startup->rlogin_port=513;
+
 	thread_up();
 
 	status("Initializing");