diff --git a/lib/krb5/init_creds.c b/lib/krb5/init_creds.c
index c29ef1df3..320d54c3b 100644
--- a/lib/krb5/init_creds.c
+++ b/lib/krb5/init_creds.c
@@ -194,8 +194,6 @@ get_config_bool (krb5_context context,
  * [realms] or [libdefaults] for some of the values.
  */
 
-static krb5_addresses no_addrs = {0, NULL};
-
 void KRB5_LIB_FUNCTION
 krb5_get_init_creds_opt_set_default_flags(krb5_context context,
 					  const char *appname,
@@ -226,9 +224,9 @@ krb5_get_init_creds_opt_set_default_flags(krb5_context context,
 	krb5_get_init_creds_opt_set_renew_life(opt, t);
 
     krb5_appdefault_boolean(context, appname, realm, "no-addresses", 
-			    KRB5_ADDRESSLESS_DEFAULT, &b);
+			    FALSE, &b);
     if (b)
-	krb5_get_init_creds_opt_set_address_list (opt, &no_addrs);
+	krb5_get_init_creds_opt_set_addressless (opt, TRUE);
 
 #if 0
     krb5_appdefault_boolean(context, appname, realm, "anonymous", FALSE, &b);
@@ -360,8 +358,8 @@ krb5_get_init_creds_opt_set_pac_request(krb5_context context,
     if (ret)
 	return ret;
     opt->opt_private->req_pac = req_pac ?
-	KRB5_PA_PAC_REQ_TRUE :
-	KRB5_PA_PAC_REQ_FALSE;
+	KRB5_INIT_CREDS_TRISTATE_TRUE :
+	KRB5_INIT_CREDS_TRISTATE_FALSE;
     return 0;
 }
 
@@ -393,3 +391,19 @@ krb5_get_init_creds_opt_get_error(krb5_context context,
 
     return 0;
 }
+
+krb5_error_code KRB5_LIB_FUNCTION
+krb5_get_init_creds_opt_set_addressless(krb5_context context,
+					krb5_get_init_creds_opt *opt,
+					krb5_boolean addressless)
+{
+    krb5_error_code ret;
+    ret = require_ext_opt(context, opt, "init_creds_opt_set_pac_req");
+    if (ret)
+	return ret;
+    if (addressless)
+	opt->opt_private->addressless = KRB5_INIT_CREDS_TRISTATE_TRUE;
+    else
+	opt->opt_private->addressless = KRB5_INIT_CREDS_TRISTATE_FALSE;
+    return 0;
+}