diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index 16bd619..246d71a 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -3577,8 +3577,10 @@
         if( ( status != PSA_SUCCESS ) &&
             ( opt.query_config_mode == DFL_QUERY_CONFIG_MODE ) )
         {
-            mbedtls_printf( "Failed to destroy key slot %u - error was %d",
-                            (unsigned) slot, (int) status );
+            mbedtls_printf( "Failed to destroy key slot %u-%u - error was %d",
+                            MBEDTLS_SVC_KEY_ID_GET_OWNER_ID( slot ),
+                            MBEDTLS_SVC_KEY_ID_GET_KEY_ID( slot ),
+                            (int) status );
             if( ret == 0 )
                 ret = MBEDTLS_ERR_SSL_HW_ACCEL_FAILED;
         }
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index fce2e22..eb4ab0d 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -4518,8 +4518,10 @@
         if( ( status != PSA_SUCCESS ) &&
             ( opt.query_config_mode == DFL_QUERY_CONFIG_MODE ) )
         {
-            mbedtls_printf( "Failed to destroy key slot %u - error was %d",
-                            (unsigned) psk_slot, (int) status );
+            mbedtls_printf( "Failed to destroy key slot %u-%u - error was %d",
+                            MBEDTLS_SVC_KEY_ID_GET_OWNER_ID( psk_slot ),
+                            MBEDTLS_SVC_KEY_ID_GET_KEY_ID( psk_slot ),
+                            (int) status );
         }
     }
 #endif /* MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED &&