diff --git a/src/modules/tracking/Config.cpp b/src/modules/tracking/Config.cpp
index 2c62447b1..8b5decd76 100644
--- a/src/modules/tracking/Config.cpp
+++ b/src/modules/tracking/Config.cpp
@@ -149,6 +149,8 @@ UserTrackingConfig::setConfigurationMap( const QVariantMap& configurationMap )
 Config::Config( QObject* parent )
     : QObject( parent )
     , m_installTracking( new InstallTrackingConfig( this ) )
+    , m_machineTracking( new MachineTrackingConfig( this ) )
+    , m_userTracking( new UserTrackingConfig( this ) )
 {
 }
 
@@ -169,6 +171,18 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
     {
         m_installTracking->setConfigurationMap( subconfig );
     }
+
+    subconfig = CalamaresUtils::getSubMap( configurationMap, "machine", success );
+    if ( success )
+    {
+        m_machineTracking->setConfigurationMap( subconfig );
+    }
+
+    subconfig = CalamaresUtils::getSubMap( configurationMap, "user", success );
+    if ( success )
+    {
+        m_userTracking->setConfigurationMap( subconfig );
+    }
 }
 
 QString
diff --git a/src/modules/tracking/Config.h b/src/modules/tracking/Config.h
index d9210b7ff..1a451e5ce 100644
--- a/src/modules/tracking/Config.h
+++ b/src/modules/tracking/Config.h
@@ -175,6 +175,8 @@ private:
     QString m_generalPolicy;
 
     InstallTrackingConfig* m_installTracking;
+    MachineTrackingConfig* m_machineTracking;
+    UserTrackingConfig* m_userTracking;
 };
 
 #endif