diff --git a/bin/xen-create-image b/bin/xen-create-image
index bc9b978..d6f4455 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -3938,6 +3938,8 @@ sub setupRootPassword
                         prompt => 'Do you want to try to change the password again??',
                         default => 'y',
                     );
+                } else {
+                    $tryagain=0;
                 }
             }
         }
diff --git a/debian/changelog b/debian/changelog
index 13f1d2e..b4950b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 xen-tools (4.4~dev-1) UNRELEASED; urgency=low
 
+  * Fixed password prompt iteration
   * Also switch from cdn.debian.net to http.debian.net in xen-tools.conf
   * Do not run "passwd" via runCommand as that one captures STDOUT for
     logging. Makes --passwd usable again. Thanks to Christian Herzog for