diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c
index cd2d5c582..d692690d9 100644
--- a/kdc/kerberos5.c
+++ b/kdc/kerberos5.c
@@ -2760,7 +2760,7 @@ out:
 				 r->rep.padata,
 			         r->armor_crypto,
 			         &req->req_body,
-			         r->error_code,
+			         r->error_code ? r->error_code : ret,
 			         r->client_princ,
 			         r->server_princ,
 			         NULL, NULL,
diff --git a/kdc/krb5tgs.c b/kdc/krb5tgs.c
index 704e24645..06c42df20 100644
--- a/kdc/krb5tgs.c
+++ b/kdc/krb5tgs.c
@@ -2178,7 +2178,7 @@ out:
 				 &error_method,
 				 r->armor_crypto,
 				 &req->req_body,
-				 r->error_code,
+				 r->error_code ? r->error_code : ret,
 				 r->client_princ,
 				 r->server_princ,
 				 csec, cusec,