diff --git a/lib/kadm5/chpass_c.c b/lib/kadm5/chpass_c.c
index fdf327bec..015c70bff 100644
--- a/lib/kadm5/chpass_c.c
+++ b/lib/kadm5/chpass_c.c
@@ -47,6 +47,10 @@ kadm5_c_chpass_principal(void *server_handle,
     int32_t tmp;
     krb5_data reply;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;
@@ -83,6 +87,10 @@ kadm5_c_chpass_principal_with_key(void *server_handle,
     krb5_data reply;
     int i;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;
diff --git a/lib/kadm5/create_c.c b/lib/kadm5/create_c.c
index 8eee314a2..391d02e5e 100644
--- a/lib/kadm5/create_c.c
+++ b/lib/kadm5/create_c.c
@@ -48,6 +48,10 @@ kadm5_c_create_principal(void *server_handle,
     int32_t tmp;
     krb5_data reply;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;
diff --git a/lib/kadm5/delete_c.c b/lib/kadm5/delete_c.c
index a3a6c0adc..f1785a4ae 100644
--- a/lib/kadm5/delete_c.c
+++ b/lib/kadm5/delete_c.c
@@ -45,6 +45,10 @@ kadm5_c_delete_principal(void *server_handle, krb5_principal princ)
     int32_t tmp;
     krb5_data reply;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;
diff --git a/lib/kadm5/get_c.c b/lib/kadm5/get_c.c
index 01fc9722f..4b008f323 100644
--- a/lib/kadm5/get_c.c
+++ b/lib/kadm5/get_c.c
@@ -48,6 +48,10 @@ kadm5_c_get_principal(void *server_handle,
     int32_t tmp;
     krb5_data reply;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;
diff --git a/lib/kadm5/get_princs_c.c b/lib/kadm5/get_princs_c.c
index 14661dc42..b0942285b 100644
--- a/lib/kadm5/get_princs_c.c
+++ b/lib/kadm5/get_princs_c.c
@@ -48,6 +48,10 @@ kadm5_c_get_principals(void *server_handle,
     int32_t tmp;
     krb5_data reply;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;
diff --git a/lib/kadm5/modify_c.c b/lib/kadm5/modify_c.c
index 66b586007..e93180ab3 100644
--- a/lib/kadm5/modify_c.c
+++ b/lib/kadm5/modify_c.c
@@ -47,6 +47,10 @@ kadm5_c_modify_principal(void *server_handle,
     int32_t tmp;
     krb5_data reply;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;
diff --git a/lib/kadm5/privs_c.c b/lib/kadm5/privs_c.c
index fc06789c7..acb656c49 100644
--- a/lib/kadm5/privs_c.c
+++ b/lib/kadm5/privs_c.c
@@ -45,6 +45,10 @@ kadm5_c_get_privs(void *server_handle, u_int32_t *privs)
     int32_t tmp;
     krb5_data reply;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;
diff --git a/lib/kadm5/randkey_c.c b/lib/kadm5/randkey_c.c
index e940e33bd..f091e5773 100644
--- a/lib/kadm5/randkey_c.c
+++ b/lib/kadm5/randkey_c.c
@@ -48,6 +48,10 @@ kadm5_c_randkey_principal(void *server_handle,
     int32_t tmp;
     krb5_data reply;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;
diff --git a/lib/kadm5/rename_c.c b/lib/kadm5/rename_c.c
index 29e05803c..07a515ef1 100644
--- a/lib/kadm5/rename_c.c
+++ b/lib/kadm5/rename_c.c
@@ -47,6 +47,10 @@ kadm5_c_rename_principal(void *server_handle,
     int32_t tmp;
     krb5_data reply;
 
+    ret = _kadm5_connect(server_handle);
+    if(ret)
+	return ret;
+
     sp = krb5_storage_from_mem(buf, sizeof(buf));
     if (sp == NULL)
 	return ENOMEM;