diff --git a/kpasswd/kpasswd.c b/kpasswd/kpasswd.c
index 3210664a8..7a193acec 100644
--- a/kpasswd/kpasswd.c
+++ b/kpasswd/kpasswd.c
@@ -87,13 +87,13 @@ change_password(krb5_context context,
 	return 1;
     }
 
-    ret = krb5_set_password (context, id, pwbuf,
-			     principal,
-			     &result_code,
-			     &result_code_string,
-			     &result_string);
+    ret = krb5_set_password_using_ccache (context, id, pwbuf,
+					  principal,
+					  &result_code,
+					  &result_code_string,
+					  &result_string);
     if (ret) {
-	krb5_warn (context, ret, "krb5_set_password");
+	krb5_warn (context, ret, "krb5_set_password_using_ccache");
 	return 1;
     }
 
diff --git a/lib/kadm5/ad.c b/lib/kadm5/ad.c
index 33b1e9c47..a026a2f69 100644
--- a/lib/kadm5/ad.c
+++ b/lib/kadm5/ad.c
@@ -510,14 +510,14 @@ kadm5_ad_chpass_principal(void *server_handle,
     krb5_data_zero (&result_code_string);
     krb5_data_zero (&result_string);
 
-    ret = krb5_set_password (context->context, 
-			     context->ccache,
-			     password,
-			     principal,
-			     &result_code,
-			     &result_code_string,
-			     &result_string);
-
+    ret = krb5_set_password_using_ccache (context->context, 
+					  context->ccache,
+					  password,
+					  principal,
+					  &result_code,
+					  &result_code_string,
+					  &result_string);
+    
     krb5_data_free (&result_code_string);
     krb5_data_free (&result_string);
 
@@ -1247,13 +1247,13 @@ kadm5_ad_randkey_principal(void *server_handle,
     krb5_data_zero (&result_code_string);
     krb5_data_zero (&result_string);
 
-    ret = krb5_set_password (context->context, 
-			     context->ccache,
-			     password,
-			     principal,
-			     &result_code,
-			     &result_code_string,
-			     &result_string);
+    ret = krb5_set_password_using_ccache (context->context, 
+					  context->ccache,
+					  password,
+					  principal,
+					  &result_code,
+					  &result_code_string,
+					  &result_string);
 
     krb5_data_free (&result_code_string);
     krb5_data_free (&result_string);