diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c
index 6b6ab9e84..6915efb78 100644
--- a/lib/krb5/get_cred.c
+++ b/lib/krb5/get_cred.c
@@ -237,6 +237,11 @@ krb5_get_kdc_cred(krb5_context context,
 
     memset(&rep, 0, sizeof(rep));
     if(decode_TGS_REP(resp.data, resp.length, &rep.part1, &len) == 0){
+	krb5_copy_creds_contents (context,
+				  in_creds,
+				  *out_creds);
+
+#if 0
 	krb5_copy_principal (context,
 			     in_creds->client,
 			     &(*out_creds)->client);
@@ -244,7 +249,7 @@ krb5_get_kdc_cred(krb5_context context,
 	krb5_copy_principal (context,
 			     in_creds->server,
 			     &(*out_creds)->server);
-
+#endif
 
 	ret = extract_ticket(context,
 			     &rep,