diff --git a/YSFGateway/YSFGateway.cpp b/YSFGateway/YSFGateway.cpp
index f75164e..25b93d1 100644
--- a/YSFGateway/YSFGateway.cpp
+++ b/YSFGateway/YSFGateway.cpp
@@ -840,6 +840,8 @@ void CYSFGateway::startupLinking()
 			m_linkType = LINK_NONE;
 
 			CYSFReflector* reflector = m_reflectors->findByName(m_startup);
+            if (reflector == NULL)
+				reflector = m_reflectors->findById(m_startup);
 			if (reflector != NULL) {
 				LogMessage("Automatic (re-)connection to %5.5s - \"%s\"", reflector->m_id.c_str(), reflector->m_name.c_str());
 
diff --git a/YSFGateway/YSFReflectors.cpp b/YSFGateway/YSFReflectors.cpp
index 9ac73bc..cdf0401 100644
--- a/YSFGateway/YSFReflectors.cpp
+++ b/YSFGateway/YSFReflectors.cpp
@@ -267,7 +267,7 @@ bool CYSFReflectors::load()
 		if (CUDPSocket::lookup(m_YSFDirectAddress, m_YSFDirectPort, addr, addrLen) == 0) {
 			CYSFReflector* refl = new CYSFReflector;
 			refl->m_id      = "00006";
-			refl->m_name    = "YSFDirect       ";
+			refl->m_name    = "YSFDIRECT       ";
 			refl->m_desc    = "Link YSFDirect";
 			refl->m_addr    = addr;
 			refl->m_addrLen = addrLen;