diff --git a/setup/page3.php b/setup/page3.php
index ad04beeddc..66a18d3c85 100644
--- a/setup/page3.php
+++ b/setup/page3.php
@@ -68,7 +68,7 @@
 
 echo "<p>The admin username is <textarea name=\"admin_username\">" . $_POST['account'] . "</textarea></p>";
 
-echo "<p>The admin password is <textarea name=\"admin_password\">" . htmlspecialchars($_POST['password']) . "</textarea></p>";
+echo "<p>The admin password is <textarea name=\"admin_password\">" . $_POST['password'] . "</textarea></p>";
 
 if (function_exists('mime_content_type')) {
     echo "<p>Whether the file MIME type check should be enabled for imported files<textarea name=\"enable_mime_check\">false</textarea></p>";
diff --git a/setup/page_password.php b/setup/page_password.php
index cc55815ac9..6ea86eced6 100644
--- a/setup/page_password.php
+++ b/setup/page_password.php
@@ -108,9 +108,7 @@
                 if(document.getElementById('account').value==''||document.getElementById('password').value==''){
                     alert('Please set a username and password');
                     return false;
-                } else {
-                    document.getElementById('password').value = encodeURIComponent(document.getElementById('password').value);
-                }
+                } 
                 return true;" enctype="multipart/form-data">
         <label for="account">Admin account name</label><br /><br /><input type="text" width="100" name="account" id="account" /><br /><br />
         <label for="password">Admin account password</label><br /><br /><input type="password" width="100" name="password" id="password"/><br /><br />