diff --git a/core/install/install.php b/core/install/install.php
index 745a370051..3703821d11 100644
--- a/core/install/install.php
+++ b/core/install/install.php
@@ -200,8 +200,8 @@
 
 	//view code
 	if($install_step == 'select_language'){
+		echo "	<form method='post' name='frm' action=''>\n";
 		include "resources/page_parts/install_select_language.php";
-		echo "<form method='post' name='frm' action=''>\n";
 		echo "	<input type='hidden' name='install_language' value='".$_SESSION['domain']['language']['code']."'/>\n";
 		echo "	<input type='hidden' name='return_install_step' value='select_language'/>\n";
 		echo "	<input type='hidden' name='install_step' value='detect_config'/>\n";
diff --git a/core/install/resources/page_parts/install_select_language.php b/core/install/resources/page_parts/install_select_language.php
index 22a502b70e..5bd85d4016 100644
--- a/core/install/resources/page_parts/install_select_language.php
+++ b/core/install/resources/page_parts/install_select_language.php
@@ -24,46 +24,38 @@
 	Matthew Vale <github@mafoo.org>
 */
 
-	echo "<form method='post' name='frm' action=''>\n";
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-
-	echo "<tr>\n";
-	echo "<td width='30%' align='left' nowrap><b>".$text['header-select_language']."</b><br><br></td>\n";
-	echo "<td width='70%' align='right'>";
-	echo "	<input type='submit' name='submit' class='btn' value='".$text['button-select']."'/>\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
-	echo "<tr>\n";
-	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
-	echo "	".$text['label-select_language']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "<fieldset class='container'>";
+	echo "<table width='80%' border='0' cellpadding='0' cellspacing='0'>\n";
+	echo "	<tr>\n";
+	echo "		<td width='30%' align='left' nowrap><b>".$text['header-select_language']."</b><br><br></td>\n";
+	echo "		<td width='70%' align='right'>";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-next']."'/>\n";
+	echo "		</td>\n";
+	echo "	</tr>\n";
+	echo "	<tr>\n";
+	echo "		<td class='vncellreq' valign='top' align='left' nowrap>\n";
+	echo "			".$text['label-select_language']."\n";
+	echo "		</td>\n";
+	echo "		<td class='vtable' align='left'>\n";
+	echo "			<fieldset class='container'>";
 	foreach($_SESSION['app']['languages'] as $lang_code){
-		echo "<fieldset class='container'>";
-		echo "	<label class='radio' style='width:200px;'>";
-		echo "	<input type='radio' name='install_language' value='$lang_code' id='lang_$lang_code' onchange='JavaScript:disable_next()'";
+		echo "			<fieldset class='container'>";
+		echo "				<label class='radio' style='width:200px;'>";
+		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'";
 		}
 		echo "/>";
-		echo "<img src='<!--{project_path}-->/core/install/resources/images/flags/$lang_code.png' alt='$lang_code'/>&nbsp;".$text["language-$lang_code"];
-		echo "</label>\n";
-		echo "</fieldset>";
+		echo "				<img src='<!--{project_path}-->/core/install/resources/images/flags/$lang_code.png' alt='$lang_code'/>&nbsp;".$text["language-$lang_code"];
+		echo "				</label>\n";
+		echo "			</fieldset>";
 	}
-	echo "</fieldset>";
-	echo "<br />\n";
-	echo $text['description-select_language']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
+	echo "			</fieldset>";
+	echo "			<br />\n";
+	echo "			".$text['description-select_language']."\n";
+	echo "		</td>\n";
+	echo "	</tr>\n";
 	echo "</table>";
 	echo "<br><br>";
-	echo "</form>";
-?><script type='text/javascript'>
-function disable_next() {
-	document.getElementById("next").style.display = 'none';
-}
-</script>
\ No newline at end of file
+
+?>
\ No newline at end of file