diff --git a/src/plugins/auth/munge/auth_munge.c b/src/plugins/auth/munge/auth_munge.c
index 6d70bbed513824b6950a83d47fdde1b35d0e71fe..fa8f4d365de7eea6fe72cedb37cb84a31d159ac7 100644
--- a/src/plugins/auth/munge/auth_munge.c
+++ b/src/plugins/auth/munge/auth_munge.c
@@ -548,23 +548,23 @@ _print_cred_info(munge_info_t *mi)
 
 	xassert(mi != NULL);
 
-	if (mi->encoded > 0)
+	if (mi->encoded > 0) {
 		info ("ENCODED: %s", ctime_r(&mi->encoded, buf));
-	if (mi->decoded > 0)
+	}
+	if (mi->decoded > 0) {
 		info ("DECODED: %s", ctime_r(&mi->decoded, buf));
-
-	if (  (mi->cipher > MUNGE_CIPHER_NONE) 
-	   && (mi->cipher < MUNGE_CIPHER_LAST_ENTRY) )
-		info ("CIPHER:  %s", munge_cipher_strings[mi->cipher]);
-
-	if (  (mi->mac > MUNGE_MAC_NONE) 
-	   && (mi->mac < MUNGE_MAC_LAST_ENTRY) ) {
-		info ("MAC:     %s", munge_mac_strings[mi->mac]);
-		/*
-		 *  Only print ZIP if MAC is valid.
-		 *   (because ZIP == NONE could be valid)
-		 */
-		info ("ZIP:     %s", munge_zip_strings[mi->zip]);
+	}
+	if (munge_enum_is_valid(MUNGE_ENUM_CIPHER, mi->cipher)) {
+		info ("CIPHER:  %s",
+			munge_enum_int_to_str(MUNGE_ENUM_CIPHER, mi->cipher));
+	}
+	if (munge_enum_is_valid(MUNGE_ENUM_MAC, mi->mac)) {
+		info ("MAC:     %s",
+			munge_enum_int_to_str(MUNGE_ENUM_MAC, mi->mac));
+	}
+	if (munge_enum_is_valid(MUNGE_ENUM_ZIP, mi->zip)) {
+		info ("ZIP:     %s",
+			munge_enum_int_to_str(MUNGE_ENUM_ZIP, mi->zip));
 	}
 }