Index: wp-admin/includes/file.php
===================================================================
--- wp-admin/includes/file.php	(revision 11521)
+++ wp-admin/includes/file.php	(working copy)
@@ -678,6 +678,7 @@
 	$credentials['hostname'] = defined('FTP_HOST') ? FTP_HOST : (!empty($_POST['hostname']) ? $_POST['hostname'] : $credentials['hostname']);
 	$credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
 	$credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : '');
+	$credentials['store_details'] = isset($_POST['store_details']) ? (bool)$_POST['store_details'] : true;
 
 	// Check to see if we are setting the public/private keys for ssh
 	$credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? $_POST['public_key'] : '');
@@ -710,6 +711,9 @@
 			$stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
 
 		unset($stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key']);
+		if ( ! $stored_credentials['store_details'] ) //Clear all details if user doesnt want to store their options.
+			$stored_credentials = array('store_details' => false );
+
 		update_option('ftp_credentials', $stored_credentials);
 		return $credentials;
 	}
@@ -717,6 +721,7 @@
 	$username = '';
 	$password = '';
 	$connection_type = '';
+	$store_details = true;
 	if ( !empty($credentials) )
 		extract($credentials, EXTR_OVERWRITE);
 	if ( $error ) {
@@ -760,6 +765,9 @@
 <th scope="row"><label for="password"><?php _e('Password') ?></label></th>
 <td><input name="password" type="password" id="password" value="<?php if ( defined('FTP_PASS') ) echo '*****'; ?>"<?php if ( defined('FTP_PASS') ) echo ' disabled="disabled"' ?> size="40" /></td>
 </tr>
+<tr valign="top">
+<th scope="row" colspan="2"><input type="checkbox" name="store_details" id="store_details" <?php checked($store_details, true); ?> /><label for="store_details"><?php _e('Remember hostname and Username') ?></label></th>
+</tr>
 
 <?php if ( extension_loaded('ssh2') ) : ?>
 <tr id="ssh_keys" valign="top" style="<?php if ( 'ssh' != $connection_type ) echo 'display:none' ?>">