diff --git a/src/network/network.c b/src/network/network.c
index a02000372..cb81ea154 100644
--- a/src/network/network.c
+++ b/src/network/network.c
@@ -630,7 +630,7 @@ network_card_has_config(int card)
 {
     if (! net_cards[card].device) return(0);
 
-    return(net_cards[card].device->config ? 1 : 0);
+    return(device_has_config(net_cards[card].device) ? 1 : 0);
 }
 
 
diff --git a/src/scsi/scsi.c b/src/scsi/scsi.c
index 7edfa1844..cf6f0207e 100644
--- a/src/scsi/scsi.c
+++ b/src/scsi/scsi.c
@@ -153,7 +153,7 @@ scsi_card_has_config(int card)
 {
     if (! scsi_cards[card].device) return(0);
 
-    return(scsi_cards[card].device->config ? 1 : 0);
+    return(device_had_config(scsi_cards[card].device) ? 1 : 0);
 }