diff --git a/templates/shop/form-login.php b/templates/shop/form-login.php
index 18ac9969716..f4fca1f2c0b 100644
--- a/templates/shop/form-login.php
+++ b/templates/shop/form-login.php
@@ -30,7 +30,12 @@ if (is_user_logged_in()) return;
 		<?php wp_nonce_field( 'woocommerce-login' ) ?>
 		<input type="submit" class="button" name="login" value="<?php _e( 'Login', 'woocommerce' ); ?>" />
 		<input type="hidden" name="redirect" value="<?php echo esc_url( $redirect ) ?>" />
-		<a class="lost_password" href="<?php echo esc_url( wp_lostpassword_url( home_url() ) ); ?>"><?php _e( 'Lost Password?', 'woocommerce' ); ?></a>
+		<label for="rememberme" class="inline">
+			<input name="rememberme" type="checkbox" id="rememberme" value="forever" /> <?php _e( 'Remember me', 'woocommerce' ); ?>
+		</label>
+	</p>
+	<p class="lost_password">
+		<a href="<?php echo esc_url( woocommerce_get_endpoint_url( 'lost-password', '', get_permalink( woocommerce_get_page_id( 'myaccount' ) ) ) ); ?>"><?php _e( 'Lost your password?', 'woocommerce' ); ?></a>
 	</p>
 
 	<div class="clear"></div>