diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index f22484860..a974df3be 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -27,7 +27,7 @@ $separator = PMA_get_arg_separator('html');
 messages_begin();
 
 //
-// Check phpMyAdmin version 
+// Check phpMyAdmin version
 //
 if (isset($_GET['version_check'])) {
     PMA_version_check();
@@ -63,7 +63,7 @@ if (!$is_https) {
 ?>
 
 <form id="select_lang" method="post" action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI']) ?>">
-	<?php echo PMA_generate_common_hidden_inputs() ?>
+    <?php echo PMA_generate_common_hidden_inputs() ?>
     <bdo xml:lang="en" dir="ltr"><label for="lang">
     <?php echo $GLOBALS['strLanguage'] . ($GLOBALS['strLanguage'] != 'Language' ? ' - Language' : '') ?>
     </label></bdo><br />
@@ -72,7 +72,7 @@ if (!$is_https) {
     // create language list
     $lang_list = array();
     foreach ($all_languages as $each_lang_key => $each_lang) {
-        if (!file_exists('./setup/lang/' . $each_lang[1] . '.inc.php')) {
+        if (!file_exists($GLOBALS['lang_path'] . $each_lang[1] . '.inc.php')) {
             continue;
         }
 
diff --git a/setup/lang/english-utf-8.inc.php b/setup/lang/english-utf-8.inc.php
index 020a431e7..5f305383e 100644
--- a/setup/lang/english-utf-8.inc.php
+++ b/setup/lang/english-utf-8.inc.php
@@ -49,7 +49,7 @@ $str['Version_check_link'] = 'Check for latest version';
 
 // main page messages
 $str['Cannot_load_config'] = 'Cannot load or save configuration';
-$str['Cannot_load_config_desc'] = 'Please create web server writeable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.';
+$str['Cannot_load_config_desc'] = 'Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.';
 $str['Insecure_connection'] = 'Insecure connection';
 $str['Insecure_connection_desc1'] = 'You are not using a secure connection, all data (including sensitive, like passwords) is transferred unencrypted!';
 $str['Insecure_connection_desc2'] = 'If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.';
@@ -72,7 +72,7 @@ $str['blowfish_secret_chars_msg'] = 'Key should contain alphanumerics, letters [
 $str['ForceSSL_msg'] = 'This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be enabled if your web server supports it';
 $str['AllowArbitraryServer_msg'] = 'This [a@?page=form&amp;formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&amp;formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.';
 $str['LoginCookieValidity_msg'] = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.';
-$str['Directory_notice'] = 'This value should be double checked to ensure that this directory is neither world accessible nor readable or writeable by other users on your server.';
+$str['Directory_notice'] = 'This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.';
 
 // form errors
 $str['error_form'] = 'Submitted form contains errors';
diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
index b8c0955ed..fe031d366 100644
--- a/setup/lib/common.inc.php
+++ b/setup/lib/common.inc.php
@@ -25,28 +25,12 @@ if ($error_handler->countErrors() > 0) {
     $error_handler->dispAllErrors();
 }
 
-// check selected language
-$lang_file = './setup/lang/' . $GLOBALS['available_languages'][$GLOBALS['lang']][1] . '.inc.php';
-if (!file_exists($lang_file)) {
-    // select_lang.lib.php did detection for us, so if language failed assume
-    // English is the only matching choice
-    $GLOBALS['lang'] = 'en-utf-8';
-    require_once $GLOBALS['lang_path'] . 'english-utf-8.inc.php';
-}
-
 // Load setup script translation
 $lang_file = './setup/lang/' . $GLOBALS['available_languages'][$GLOBALS['lang']][1] . '.inc.php';
 if (!file_exists($lang_file)) {
     $lang_file = './setup/lang/english-utf-8.inc.php';
 }
 require_once $lang_file;
-if (file_exists('./setup/lang/added_messages.php')) {
-    include './setup/lang/added_messages.php';
-}
-
-if (PMA_ifSetOr($_COOKIE['pma_lang'], '') != $GLOBALS['lang']) {
-    PMA_setCookie('pma_lang', $GLOBALS['lang']);
-}
 
 if (!isset($_SESSION['ConfigFile'])) {
     $_SESSION['ConfigFile'] = array();