diff --git a/src/login/login.c b/src/login/login.c
index a270a203a5..b3726bad22 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -1826,7 +1826,7 @@ int parse_login(int fd)
 		return 0;
 	}
 
-	ipl = login_config.login_ip;
+	ipl = session[fd]->client_addr;
 	ip2str(ipl, ip);
 
 	while( RFIFOREST(fd) >= 2 )
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 2037ef4636..299c068180 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -1226,7 +1226,7 @@ int parse_login(int fd)
 		return 0;
 	}
 
-	ipl = login_config.login_ip;
+	ipl = session[fd]->client_addr;
 	ip2str(ipl, ip);
 
 	while( RFIFOREST(fd) >= 2 )