diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 2b5b7f8..a44f267 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -100,7 +100,7 @@ function setup_config_display_header() {
 <title><?php _e( 'WordPress &rsaquo; Setup Configuration File' ); ?></title>
 <link rel="stylesheet" href="css/install.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
 <link rel="stylesheet" href="../wp-includes/css/buttons.css?ver=<?php echo preg_replace( '/[^0-9a-z\.-]/i', '', $wp_version ); ?>" type="text/css" />
-
+<script type="text/javascript" src="http://code.jquery.com/jquery-1.10.2.js"></script>
 </head>
 <body class="wp-core-ui<?php if ( is_rtl() ) echo ' rtl'; ?>">
 <h1 id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>"><?php _e( 'WordPress' ); ?></a></h1>
@@ -140,13 +140,23 @@ switch($step) {
 		</tr>
 		<tr>
 			<th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th>
-			<td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
+			<td><input name="uname" id="uname" type="text" size="25" placeholder="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
 			<td><?php _e( 'Your MySQL username' ); ?></td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
-			<td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" /></td>
+			<td><input name="pwd" id="pwd" type="password" autocomplete="off" size="25" placeholder="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>"/></td>
 			<td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
+		<tr>
+			<th scop="row"><label for="pwd-checkbox"></th></label>
+			<td><input type="checkbox"  onchange="tick(this)" id="showPassword"/>
+			<script>
+				function tick( e )  {
+				$( '#pwd' ).attr( 'type', e.checked ? 'text' : 'password' );
+				}
+			</script>
+			<?php _e( 'Show password' ); ?>
+			</td>
 		</tr>
 		<tr>
 			<th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>