diff --git a/lib/kadm5/dump_log.c b/lib/kadm5/dump_log.c
index ebf763f7c..534f80adb 100644
--- a/lib/kadm5/dump_log.c
+++ b/lib/kadm5/dump_log.c
@@ -81,14 +81,14 @@ main(int argc, char **argv)
     krb5_init_context(&context);
 
     memset(&conf, 0, sizeof(conf));
-    ret = kadm5_s_init_with_password_ctx (context,
-					  KADM5_ADMIN_SERVICE,
-					  "password",
-					  KADM5_ADMIN_SERVICE,
-					  &conf, 0, 0, 
-					  &kadm_handle);
+    ret = kadm5_init_with_password_ctx (context,
+					KADM5_ADMIN_SERVICE,
+					NULL,
+					KADM5_ADMIN_SERVICE,
+					&conf, 0, 0, 
+					&kadm_handle);
     if (ret)
-	krb5_err (context, 1, ret, "kadm5_s_init_with_password_ctx");
+	krb5_err (context, 1, ret, "kadm5_init_with_password_ctx");
 
     server_context = (kadm5_server_context *)kadm_handle;
 
diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c
index 2cf492eba..ee69aba24 100644
--- a/lib/kadm5/ipropd_master.c
+++ b/lib/kadm5/ipropd_master.c
@@ -314,14 +314,14 @@ main(int argc, char **argv)
     krb5_init_context(&context);
 
     memset(&conf, 0, sizeof(conf));
-    ret = kadm5_s_init_with_password_ctx (context,
-					  KADM5_ADMIN_SERVICE,
-					  "password",
-					  KADM5_ADMIN_SERVICE,
-					  &conf, 0, 0, 
-					  &kadm_handle);
+    ret = kadm5_init_with_password_ctx (context,
+					KADM5_ADMIN_SERVICE,
+					NULL,
+					KADM5_ADMIN_SERVICE,
+					&conf, 0, 0, 
+					&kadm_handle);
     if (ret)
-	krb5_err (context, 1, ret, "kadm5_s_init_with_password_ctx");
+	krb5_err (context, 1, ret, "kadm5_init_with_password_ctx");
 
     server_context = (kadm5_server_context *)kadm_handle;
 
diff --git a/lib/kadm5/ipropd_slave.c b/lib/kadm5/ipropd_slave.c
index 15941d592..ace2aa5bc 100644
--- a/lib/kadm5/ipropd_slave.c
+++ b/lib/kadm5/ipropd_slave.c
@@ -226,14 +226,14 @@ main(int argc, char **argv)
     krb5_init_context(&context);
 
     memset(&conf, 0, sizeof(conf));
-    ret = kadm5_s_init_with_password_ctx (context,
-					  KADM5_ADMIN_SERVICE,
-					  "password",
-					  KADM5_ADMIN_SERVICE,
-					  &conf, 0, 0, 
-					  &kadm_handle);
+    ret = kadm5_init_with_password_ctx (context,
+					KADM5_ADMIN_SERVICE,
+					NULL,
+					KADM5_ADMIN_SERVICE,
+					&conf, 0, 0, 
+					&kadm_handle);
     if (ret)
-	krb5_err (context, 1, ret, "kadm5_s_init_with_password_ctx");
+	krb5_err (context, 1, ret, "kadm5_init_with_password_ctx");
 
     server_context = (kadm5_server_context *)kadm_handle;
 
diff --git a/lib/kadm5/replay_log.c b/lib/kadm5/replay_log.c
index 32f58a442..0f8899a6d 100644
--- a/lib/kadm5/replay_log.c
+++ b/lib/kadm5/replay_log.c
@@ -76,14 +76,14 @@ main(int argc, char **argv)
     krb5_init_context(&context);
 
     memset(&conf, 0, sizeof(conf));
-    ret = kadm5_s_init_with_password_ctx (context,
-					  KADM5_ADMIN_SERVICE,
-					  "password",
-					  KADM5_ADMIN_SERVICE,
-					  &conf, 0, 0, 
-					  &kadm_handle);
+    ret = kadm5_init_with_password_ctx (context,
+					KADM5_ADMIN_SERVICE,
+					NULL,
+					KADM5_ADMIN_SERVICE,
+					&conf, 0, 0, 
+					&kadm_handle);
     if (ret)
-	krb5_err (context, 1, ret, "kadm5_s_init_with_password_ctx");
+	krb5_err (context, 1, ret, "kadm5_init_with_password_ctx");
 
     server_context = (kadm5_server_context *)kadm_handle;