diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c
index f84cca8..1ae2d8c 100644
--- a/vtysh/vtysh_user.c
+++ b/vtysh/vtysh_user.c
@@ -116,10 +116,10 @@
 struct user *
 user_lookup (const char *name)
 {
-  struct listnode *nn;
+  struct listnode *node, *nnode;
   struct user *user;
 
-  LIST_LOOP (userlist, user, nn)
+  for (ALL_LIST_ELEMENTS (userlist, node, nnode, user))
     {
       if (strcmp (user->name, name) == 0)
 	return user;
@@ -130,10 +130,10 @@
 void
 user_config_write ()
 {
-  struct listnode *nn;
+  struct listnode *node, *nnode;
   struct user *user;
 
-  LIST_LOOP (userlist, user, nn)
+  for (ALL_LIST_ELEMENTS (userlist, node, nnode, user))
     {
       if (user->nopassword)
 	printf (" username %s nopassword\n", user->name);