diff --git a/kadmin/server.c b/kadmin/server.c
index bf10feb19..6ed98d26b 100644
--- a/kadmin/server.c
+++ b/kadmin/server.c
@@ -338,8 +338,8 @@ kadmind_loop(krb5_context context,
     void *kadm_handle;
     ret = kadm5_init_with_password_ctx(context, 
 				       client, 
-				       "password", 
-				       "service",
+				       NULL,
+				       KADM5_ADMIN_SERVICE,
 				       NULL, 0, 0, 
 				       &kadm_handle);
     if(ret) {
diff --git a/lib/kadm5/server.c b/lib/kadm5/server.c
index bf10feb19..6ed98d26b 100644
--- a/lib/kadm5/server.c
+++ b/lib/kadm5/server.c
@@ -338,8 +338,8 @@ kadmind_loop(krb5_context context,
     void *kadm_handle;
     ret = kadm5_init_with_password_ctx(context, 
 				       client, 
-				       "password", 
-				       "service",
+				       NULL,
+				       KADM5_ADMIN_SERVICE,
 				       NULL, 0, 0, 
 				       &kadm_handle);
     if(ret) {