diff --git a/src/modules/welcomeq/WelcomeQmlViewStep.cpp b/src/modules/welcomeq/WelcomeQmlViewStep.cpp
index 0961ce67f..c1046b506 100644
--- a/src/modules/welcomeq/WelcomeQmlViewStep.cpp
+++ b/src/modules/welcomeq/WelcomeQmlViewStep.cpp
@@ -139,10 +139,10 @@ WelcomeQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     m_config->setReleaseNotesUrl( jobOrBrandingSetting( Branding::ReleaseNotesUrl, configurationMap, "showReleaseNotesUrl" ) );
     m_config->setDonateUrl( CalamaresUtils::getString( configurationMap, "showDonateUrl" ) );
 
-	// TODO: expand Config class and set the remaining fields // with the configurationMap all those properties can be accesed withouth having to declare a property, get and setter for each
+	// TODO: expand Config class and set the remaining fields // with the configurationMap all those properties can be accessed without having to declare a property, get and setter for each
 
 	// TODO: figure out how the requirements (held by ModuleManager) should be accessible
-	//          to QML as a odel. //will be model as a qvariantmap containing a alert level and the message string
+	//          to QML as a model. //will be model as a qvariantmap containing a alert level and the message string
 	if ( configurationMap.contains( "requirements" )
 		 && configurationMap.value( "requirements" ).type() == QVariant::Map )
 	{
diff --git a/src/modules/welcomeq/welcomeq.qml b/src/modules/welcomeq/welcomeq.qml
index 90de189d3..729b61b28 100644
--- a/src/modules/welcomeq/welcomeq.qml
+++ b/src/modules/welcomeq/welcomeq.qml
@@ -91,8 +91,8 @@ Page
                 Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
                 Kirigami.Theme.textColor: Kirigami.Theme.textColor
 
-                visible: config.helpUrl.isValid
-                onClicked: Qt.openUrlExternally(config.helpUrl)
+                visible: config.supportUrl !== ""
+                onClicked: Qt.openUrlExternally(config.supportUrl)
             }
             Button
             {
@@ -102,8 +102,8 @@ Page
                 Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
                 Kirigami.Theme.textColor: Kirigami.Theme.textColor
 
-                visible: config.issuesUrl.isValid
-                onClicked: Qt.openUrlExternally(config.issuesUrl)
+                visible: config.knownIssuesUrl !== ""
+                onClicked: Qt.openUrlExternally(config.knownIssuesUrl)
             }
             Button
             {
@@ -113,8 +113,8 @@ Page
                 Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
                 Kirigami.Theme.textColor: Kirigami.Theme.textColor
 
-                visible: config.notesUrl.isValid
-                onClicked: Qt.openUrlExternally(config.notesUrl)
+                visible: config.releaseNotesUrl !== ""
+                onClicked: Qt.openUrlExternally(config.releaseNotesUrl)
             }
             Button
             {
@@ -124,7 +124,7 @@ Page
                 Kirigami.Theme.backgroundColor: Qt.rgba(Kirigami.Theme.backgroundColor.r, Kirigami.Theme.backgroundColor.g, Kirigami.Theme.backgroundColor.b, 0.4)
                 Kirigami.Theme.textColor: Kirigami.Theme.textColor
 
-                visible: config.donateUrl.isValid
+                visible: config.donateUrl !== ""
                 onClicked: Qt.openUrlExternally(config.donateUrl)
             }
         }