diff --git a/bin/xen-create-image b/bin/xen-create-image
index 702756d..aef78d6 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -4160,7 +4160,13 @@ sub END
         }
         logprint("\n");
         logprint("RSA Fingerprint :  $host_rsa_key\n");
-        logprint("Root Password   :  $PASSWORD\n");
+        logprint("Root Password   :  ");
+        if ( $PASSWORD ) {
+            logprint("$PASSWORD\n");
+        } else {
+            logprint ("N/A\n");
+        }
         logprint("\n");
     }
 }
+