diff --git a/commands/password.c b/commands/password.c
index 247e0bffd..99b993839 100644
--- a/commands/password.c
+++ b/commands/password.c
@@ -17,6 +17,7 @@
  */
 
 #include <grub/auth.h>
+#include <grub/crypto.h>
 #include <grub/list.h>
 #include <grub/mm.h>
 #include <grub/misc.h>
@@ -61,10 +62,10 @@ grub_cmd_password (grub_command_t cmd __attribute__ ((unused)),
   pass = grub_zalloc (MAX_PASSLEN);
   if (!pass)
     return grub_errno;
-  copylen = grub_strlen (argv[1]);
+  copylen = grub_strlen (args[1]);
   if (copylen >= MAX_PASSLEN)
     copylen = MAX_PASSLEN - 1;
-  grub_memcpy (pass, argv[1], copylen);
+  grub_memcpy (pass, args[1], copylen);
 
   err = grub_auth_register_authentication (args[0], check_password, pass);
   if (err)
diff --git a/normal/auth.c b/normal/auth.c
index 7d5a07d26..0a8b5bc82 100644
--- a/normal/auth.c
+++ b/normal/auth.c
@@ -164,7 +164,7 @@ grub_auth_check_authentication (const char *userlist)
   auto int hook (grub_list_t item);
   int hook (grub_list_t item)
   {
-    if (grub_auth_strcmp (login, ((struct grub_auth_user *) item)->name) == 0)
+    if (grub_strcmp (login, ((struct grub_auth_user *) item)->name) == 0)
       cur = (struct grub_auth_user *) item;
     return 0;
   }