diff --git a/image_creator/dialog_menu.py b/image_creator/dialog_menu.py
index 2b6925bec2e24ce2fedeefc5aeb9b5bf722b9b8d..06e3ce1db36aa45ba08697a6c63e8a933a4478d8 100644
--- a/image_creator/dialog_menu.py
+++ b/image_creator/dialog_menu.py
@@ -690,7 +690,14 @@ def sysprep_params(session):
     advanced_names = [k for k, v in needed.items() if v.default is not None]
 
     while 1:
-        code, output = print_form(simple_names, extra_button=True)
+
+        if len(simple_names) > 0:
+            extra_button = len(advanced_names) > 0
+            code, output = print_form(simple_names, extra_button=extra_button)
+            choice = simple_names
+        elif len(advanced_names) > 0:
+            code, output = print_form(advanced_names, extra_button=False)
+            choice = advanced_names
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             return False
@@ -703,7 +710,7 @@ def sysprep_params(session):
                     break
             continue
 
-        if check_params(simple_names, output):
+        if check_params(choice, output):
             break
 
     return True