diff --git a/kpasswd/kpasswd.c b/kpasswd/kpasswd.c
index 57c989719..0258c1ac0 100644
--- a/kpasswd/kpasswd.c
+++ b/kpasswd/kpasswd.c
@@ -132,8 +132,8 @@ main (int argc, char **argv)
 	print_version(NULL);
 	return 0;
     }
-    argc -= optind;
-    argv += optind;
+    argc -= optidx;
+    argv += optidx;
 
     ret = krb5_init_context (&context);
     if (ret)