1 files changed, 4 insertions, 3 deletions

diff --git a/src/Authenticator.cpp b/src/Authenticator.cpp
index bd6db1c11..ff5ad9506 100644
--- a/src/Authenticator.cpp
+++ b/src/Authenticator.cpp
@@ -109,11 +109,12 @@ void cAuthenticator::Execute(void)
 		}
 		ASSERT(!m_Queue.empty());
 		
-		int ClientID = m_Queue.front().m_ClientID;
-		AString UserName = m_Queue.front().m_Name;
+		cAuthenticator::cUser & User = m_Queue.front();
+		int ClientID = User.m_ClientID;
+		AString UserName = User.m_Name;
 		AString ActualAddress = m_Address;
 		ReplaceString(ActualAddress, "%USERNAME%", UserName);
-		ReplaceString(ActualAddress, "%SERVERID%", m_Queue.front().m_ServerID);
+		ReplaceString(ActualAddress, "%SERVERID%", User.m_ServerID);
 		m_Queue.pop_front();
 		Lock.Unlock();