diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php
index 2375356a4..fea1b6d12 100644
--- a/install-dev/classes/controllerHttp.php
+++ b/install-dev/classes/controllerHttp.php
@@ -274,7 +274,10 @@ abstract class InstallControllerHttp
 	 */
 	public function findNextStep()
 	{
-		return (isset(self::$steps[$this->getStepOffset($this->step) + 1])) ? self::$steps[$this->getStepOffset($this->step) + 1] : false;
+		$nextStep = (isset(self::$steps[$this->getStepOffset($this->step) + 1])) ? self::$steps[$this->getStepOffset($this->step) + 1] : false;
+		if ($nextStep == 'system' && self::$instances[$nextStep]->validate())
+			$nextStep = self::$instances[$nextStep]->findNextStep();
+		return $nextStep;
 	}
 
 	/**
diff --git a/install-dev/theme/js/welcome.js b/install-dev/theme/js/welcome.js
index fa2a9c467..69b8fd351 100644
--- a/install-dev/theme/js/welcome.js
+++ b/install-dev/theme/js/welcome.js
@@ -22,4 +22,9 @@ $(document).ready(function()
 		else
 			$('#btNext').addClass('disabled').attr('disabled', true);
 	});
+	
+	if ($('#set_license').prop('checked'))
+		$('#btNext').removeClass('disabled').attr('disabled', false);
+	else
+		$('#btNext').addClass('disabled').attr('disabled', true);
 });
\ No newline at end of file