diff --git a/src/lib/registration/ui/addon_reg_codes_dialog.rb b/src/lib/registration/ui/addon_reg_codes_dialog.rb
index d96fd38d4..b65ede054 100644
--- a/src/lib/registration/ui/addon_reg_codes_dialog.rb
+++ b/src/lib/registration/ui/addon_reg_codes_dialog.rb
@@ -41,8 +41,8 @@ def run
               "<p>Registration codes are required for successfull registration." \
               "If you cannot provide a registration code then go back and deselect " \
               "the respective extension or module.</p>"),
-          GetInstArgs.enable_back || Mode.normal || Mode.config,
-          GetInstArgs.enable_next || Mode.normal || Mode.config
+          true,
+          true
         )
 
         handle_dialog
diff --git a/src/lib/registration/ui/addon_selection_dialog.rb b/src/lib/registration/ui/addon_selection_dialog.rb
index f8e8e34c8..d995c03f0 100644
--- a/src/lib/registration/ui/addon_selection_dialog.rb
+++ b/src/lib/registration/ui/addon_selection_dialog.rb
@@ -47,8 +47,8 @@ def run
             # help text (3/3)
           _("<p>If you want to remove any extension or module you need to log"\
               "into the SUSE Customer Center and remove them manually there.</p>"),
-          GetInstArgs.enable_back || Mode.normal || Mode.config, #FIXME make parameters
-          GetInstArgs.enable_next || Mode.normal || Mode.config
+          true,
+          true
         )
 
         @old_selection = Addon.selected.dup