diff --git a/core/install/install_first_time.php b/core/install/install_first_time.php
index 045c15caa1..b4366275fa 100644
--- a/core/install/install_first_time.php
+++ b/core/install/install_first_time.php
@@ -138,7 +138,6 @@ if(!$install_step) { $install_step = 'select_language'; }
 		$v_link_label_play = '';
 		$v_link_label_pause = '';
 		$default_login = 0;
-		$footer = '';
 		$onload = '';
 	}
 
diff --git a/core/install/resources/page_parts/install_config_detail.php b/core/install/resources/page_parts/install_config_detail.php
index e59ddb1a80..8ee7597ba9 100644
--- a/core/install/resources/page_parts/install_config_detail.php
+++ b/core/install/resources/page_parts/install_config_detail.php
@@ -67,12 +67,13 @@
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "		<select id='install_default_country' name='install_default_country' class='formfld' style=''>\n";
-	require_once "resources/classes/iso_countries.php";
-	foreach ($iso_countries as $iso_code => $iso_country ){
+	require "resources/countries.php";
+ 
+	foreach ($countries as $iso_code => $country ){
 		if($iso_code == $install_default_country){
-			echo "			<option value='$iso_code' selected='selected'>$iso_country</option>\n";
+			echo "			<option value='$iso_code' selected='selected'>".$country['country']."</option>\n";
 		}else{
-			echo "			<option value='$iso_code'>$iso_country</option>\n";
+			echo "			<option value='$iso_code'>".$country['country']."</option>\n";
 		}
 	}
 	echo "		</select>\n";
diff --git a/core/install/resources/page_parts/install_select_language.php b/core/install/resources/page_parts/install_select_language.php
index bcb5628c53..f6802f33bf 100644
--- a/core/install/resources/page_parts/install_select_language.php
+++ b/core/install/resources/page_parts/install_select_language.php
@@ -43,7 +43,7 @@
 	foreach($_SESSION['app']['languages'] as $lang_code){
 		echo "<fieldset style='border:none;padding:0;margin:0;width:32%;display:inline-block;margin:1px'>";
 		echo "	<label style='display:block;width:100%;border:solid 1px;padding:2px;-webkit-border-radius: 3px;-moz-border-radius: 3px;border-radius: 3px;box-sizing:border-box;'>";
-		echo "<input type='radio' name='install_language' value='$lang_code' id='lang_$lang_code'";
+		echo "<input type='radio' name='install_language' value='$lang_code' id='lang_$lang_code' onchange='JavaScript:disable_next()'";
 		if($lang_code == $_SESSION['domain']['language']['code'])
 		{
 			echo " checked='checked'";