diff --git a/src/lib/installation/clients/inst_install_inf.rb b/src/lib/installation/clients/inst_install_inf.rb
index d952ba7e0..4a6b9c28f 100644
--- a/src/lib/installation/clients/inst_install_inf.rb
+++ b/src/lib/installation/clients/inst_install_inf.rb
@@ -1,7 +1,6 @@
 require "yast"
 require "network/install_inf_convertor"
 require "installation/dialogs/registration_url_dialog"
-require "installation/installation_data"
 
 module Yast
   class InstInstallInfClient < Client
@@ -17,9 +16,6 @@ class InstInstallInfClient < Client
     def main
       textdomain "installation"
 
-      # register the installation data dump callback
-      ::Installation::InstallationData.add
-
       InstallInfConvertor.instance.write_netconfig
 
       return :next if Mode.auto
diff --git a/src/lib/installation/clients/installation.rb b/src/lib/installation/clients/installation.rb
index 2d7eb8312..3286d0b20 100644
--- a/src/lib/installation/clients/installation.rb
+++ b/src/lib/installation/clients/installation.rb
@@ -30,6 +30,7 @@
 # $Id$
 
 require "ui/wizards/layout"
+require "installation/installation_data"
 
 module Yast
   class InstallationClient < Client
@@ -48,6 +49,9 @@ def main
       Yast.import "ProductFeatures"
       Yast.import "ProductControl"
 
+      # register the installation data dump callback
+      ::Installation::InstallationData.add
+
       # log the inst-sys identification for easier debugging
       log_os_release