diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 2c6b4cc0e..0c4f44c95 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -31,6 +31,7 @@
 
 #include "locale/LabelModel.h"
 #include "modulesystem/ModuleManager.h"
+#include "modulesystem/RequirementsModel.h"
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
@@ -90,8 +91,8 @@ WelcomePage::WelcomePage( Config* conf, QWidget* parent )
              &Calamares::ModuleManager::requirementsComplete,
              m_checkingWidget,
              &CheckerContainer::requirementsComplete );
-    connect( Calamares::ModuleManager::instance(),
-             &Calamares::ModuleManager::requirementsProgress,
+    connect( Calamares::ModuleManager::instance()->requirementsModel(),
+             &Calamares::RequirementsModel::progressMessageChanged,
              m_checkingWidget,
              &CheckerContainer::requirementsProgress );
 }
diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.cpp b/src/modules/welcomeq/WelcomeQmlViewStep.cpp
index 1f173563b..42944f20d 100644
--- a/src/modules/welcomeq/WelcomeQmlViewStep.cpp
+++ b/src/modules/welcomeq/WelcomeQmlViewStep.cpp
@@ -37,6 +37,10 @@ WelcomeQmlViewStep::WelcomeQmlViewStep( QObject* parent )
     , m_config( new Config( this ) )
     , m_requirementsChecker( new GeneralRequirements( this ) )
 {
+    connect( Calamares::ModuleManager::instance(),
+            &Calamares::ModuleManager::requirementsComplete,
+            this,
+            &WelcomeQmlViewStep::nextStatusChanged );
 }
 
 
@@ -49,9 +53,7 @@ WelcomeQmlViewStep::prettyName() const
 bool
 WelcomeQmlViewStep::isNextEnabled() const
 {
-    // TODO: should return true
-    //     return m_config->property("isNextEnabled").toBool();
-    return true;
+    return m_config->requirementsModel()->satisfiedMandatory();
 }
 
 bool
diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.h b/src/modules/welcomeq/WelcomeQmlViewStep.h
index 7fb31502f..78999986c 100644
--- a/src/modules/welcomeq/WelcomeQmlViewStep.h
+++ b/src/modules/welcomeq/WelcomeQmlViewStep.h
@@ -73,7 +73,6 @@ public:
     QObject* getConfig() override;
 
 private:
-    // TODO: a generic QML viewstep should return a config object from a method
     Config* m_config;
     GeneralRequirements* m_requirementsChecker;
 };