diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index 5b863b0cc7..0100c95019 100644
--- a/src/wp-admin/install.php
+++ b/src/wp-admin/install.php
@@ -100,10 +100,11 @@ function display_setup_form( $error = null ) {
 	$sql = $wpdb->prepare( "SHOW TABLES LIKE %s", $wpdb->esc_like( $wpdb->users ) );
 	$user_table = ( $wpdb->get_var( $sql ) != null );
 
-	// Ensure that Blogs appear in search engines by default
+	// Ensure that Blogs appear in search engines by default.
 	$blog_public = 1;
-	if ( ! empty( $_POST ) )
+	if ( isset( $_POST['weblog_title'] ) ) {
 		$blog_public = isset( $_POST['blog_public'] );
+	}
 
 	$weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : '';
 	$user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : '';
@@ -251,7 +252,7 @@ switch($step) {
 		$loading_language = '';
 		if ( ! empty( $_POST['language'] ) ) {
 			$available_languages = get_available_languages();
-			if ( isset( $available_languages[ $_POST['language'] ] ) ) {
+			if ( in_array( $_POST['language'], $available_languages ) ) {
 				$loading_language = $_POST['language'];
 				load_textdomain( 'default', WP_LANG_DIR . "/{$loading_language}.mo" );
 				load_textdomain( 'default', WP_LANG_DIR . "/admin-{$loading_language}.mo" );