diff --git a/templates/myaccount/form-login.php b/templates/myaccount/form-login.php
index 00e2d1ea003..aebdea23359 100644
--- a/templates/myaccount/form-login.php
+++ b/templates/myaccount/form-login.php
@@ -32,7 +32,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 			<p class="form-row form-row-wide">
 				<label for="username"><?php _e( 'Username or email address', 'woocommerce' ); ?> <span class="required">*</span></label>
-				<input type="text" class="input-text" name="username" id="username" />
+				<input type="text" class="input-text" name="username" id="username" value="<?php if ( ! empty( $_POST['username'] ) ) echo esc_attr( $_POST['username'] ); ?>" />
 			</p>
 			<p class="form-row form-row-wide">
 				<label for="password"><?php _e( 'Password', 'woocommerce' ); ?> <span class="required">*</span></label>
@@ -86,7 +86,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 	
 				<p class="form-row form-row-wide">
 					<label for="reg_password"><?php _e( 'Password', 'woocommerce' ); ?> <span class="required">*</span></label>
-					<input type="password" class="input-text" name="password" id="reg_password" value="<?php if ( ! empty( $_POST['password'] ) ) echo esc_attr( $_POST['password'] ); ?>" />
+					<input type="password" class="input-text" name="password" id="reg_password" />
 				</p>
 
 			<?php endif; ?>
@@ -111,4 +111,4 @@ if ( ! defined( 'ABSPATH' ) ) {
 </div>
 <?php endif; ?>
 
-<?php do_action( 'woocommerce_after_customer_login_form' ); ?>
\ No newline at end of file
+<?php do_action( 'woocommerce_after_customer_login_form' ); ?>