diff --git a/pbs-client-installer.sh b/pbs-client-installer.sh
index 0c27e12..61a3452 100755
--- a/pbs-client-installer.sh
+++ b/pbs-client-installer.sh
@@ -168,7 +168,8 @@ show_targets_list() {
             echo "Target: $target"
 
             # Check if config seems incomplete
-            if [ -z "$PBS_SERVER" ] || [ -z "$PBS_DATASTORE" ]; then
+            if [ -z "$PBS_SERVER" ] || [ -z "$PBS_DATASTORE" ] || \
+               [ "$PBS_SERVER" = "unknown" ] || [ "$PBS_DATASTORE" = "unknown" ]; then
                 echo "  Status: ⚠ Incomplete configuration"
                 echo "  Action: Use option 3 (Edit target) to reconfigure"
             else