diff --git a/src/sbbs3/sbbscon.c b/src/sbbs3/sbbscon.c
index f5c24adeaebc7ccfb53e379f3565dcde510c3cdc..67b859c58d9f3ad2d39b79d5fc33b2a16b22da41 100644
--- a/src/sbbs3/sbbscon.c
+++ b/src/sbbs3/sbbscon.c
@@ -2117,7 +2117,7 @@ int main(int argc, char** argv)
 
 					    listLock(&login_attempt_list);
 						count=0;
-						for(node=listFirstNode(&login_attempt_list); node!=NULL; node=listNextNode(node)) {
+						for(node=login_attempt_list.first; node!=NULL; node=node->next) {
 							login_attempt=node->data;
 							localtime_r(&login_attempt->time,&tm);
 							printf("%u attempts (%u duplicate) from %s, last via %s on %u/%u %02u:%02u:%02u (user: %s, password: %s)\n"
@@ -2152,7 +2152,7 @@ int main(int argc, char** argv)
 
 					    listLock(&client_list);
 						count=0;
-						for(node=listFirstNode(&client_list); node!=NULL; node=listNextNode(node)) {
+						for(node=client_list.first; node!=NULL; node=node->next) {
 							client=node->data;
 							localtime_r(&client->time,&tm);
 							printf("%04d %s %s %s %s port %u since %u/%u %02u:%02u:%02u\n"
diff --git a/src/sbbs3/userdat.c b/src/sbbs3/userdat.c
index f2d66805fc795c6cdfc397432771c162249e6c7a..238760d6127fdefb54381a67eb8d92d0a7edb295 100644
--- a/src/sbbs3/userdat.c
+++ b/src/sbbs3/userdat.c
@@ -2695,7 +2695,7 @@ static list_node_t* login_attempted(link_list_t* list, SOCKADDR_IN* addr)
 	list_node_t*		node;
 	login_attempt_t*	attempt;
 
-	for(node=listFirstNode(list); node!=NULL; node=listNextNode(node)) {
+	for(node=list->first; node!=NULL; node=node->next) {
 		attempt=node->data;
 		if(memcmp(&attempt->addr,&addr->sin_addr,sizeof(attempt->addr))==0)
 			break;