diff --git a/scss/_bscore_woocommerce.scss b/scss/_bscore_woocommerce.scss
index c753f8cb..0f3cfd90 100644
--- a/scss/_bscore_woocommerce.scss
+++ b/scss/_bscore_woocommerce.scss
@@ -9,6 +9,7 @@
 @import "bootscore_woocommerce/wc_buttons";
 @import "bootscore_woocommerce/wc_checkout";
 @import "bootscore_woocommerce/wc_comments";
+@import "bootscore_woocommerce/wc_form_login";
 @import "bootscore_woocommerce/wc_forms";
 @import "bootscore_woocommerce/wc_loader";
 @import "bootscore_woocommerce/wc_loop";
diff --git a/scss/bootscore_woocommerce/_wc_form_login.scss b/scss/bootscore_woocommerce/_wc_form_login.scss
new file mode 100644
index 00000000..cbce2f18
--- /dev/null
+++ b/scss/bootscore_woocommerce/_wc_form_login.scss
@@ -0,0 +1,30 @@
+/*--------------------------------------------------------------
+WooCommerce Form Login
+--------------------------------------------------------------*/
+
+.woocommerce {
+
+  form.login,
+  form.register {
+    // Create card
+    background: $card-bg;
+    border: $card-border-width solid $card-border-color;
+    border-radius: $card-border-radius;
+    //padding: $card-spacer-y $card-spacer-x;
+    padding-top: $card-spacer-y;
+    padding-right: $card-spacer-x;
+    padding-left: $card-spacer-x;
+    margin-bottom: $spacer;
+  }
+
+  // Remember me checkbox
+  .woocommerce-form-login .woocommerce-form-login__rememberme {
+    @extend .form-check;
+    display: block;
+    margin-bottom: $spacer;
+
+    #rememberme {
+      @extend .form-check-input;
+    }
+  }
+}
diff --git a/scss/bootscore_woocommerce/_wc_my_account.scss b/scss/bootscore_woocommerce/_wc_my_account.scss
index 65465707..ec451082 100644
--- a/scss/bootscore_woocommerce/_wc_my_account.scss
+++ b/scss/bootscore_woocommerce/_wc_my_account.scss
@@ -75,19 +75,4 @@ WooCommerce My Account
     }
 
   }
-
-  form.login {
-    margin-bottom: $spacer *1.5;
-  }
-
-  // Remember me checkbox
-  .woocommerce-form-login .woocommerce-form-login__rememberme {
-    @extend .form-check;
-    display: block;
-    margin-bottom: $spacer;
-
-    #rememberme {
-      @extend .form-check-input;
-    }
-  }
 }
diff --git a/woocommerce/global/form-login.php b/woocommerce/global/form-login.php
deleted file mode 100644
index 64b37cb5..00000000
--- a/woocommerce/global/form-login.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/**
- * Login form
- *
- * This template can be overridden by copying it to yourtheme/woocommerce/global/form-login.php.
- *
- * HOWEVER, on occasion WooCommerce will need to update template files and you
- * (the theme developer) will need to copy the new files to your theme to
- * maintain compatibility. We try to do this as little as possible, but it does
- * happen. When this occurs the version of the template file will be bumped and
- * the readme will list any important changes.
- *
- * @see 	    https://docs.woocommerce.com/document/template-structure/
- * @package 	WooCommerce/Templates
-
- * @version     7.0.1
- */
-
-// Exit if accessed directly.
-defined('ABSPATH') || exit;
-
-if (is_user_logged_in()) {
-  return;
-}
-
-?>
-<form class="woocommerce-form woocommerce-form-login login" method="post" <?php echo ($hidden) ? 'style="display:none;"' : ''; ?>>
-
-  <div class="card mb-3">
-
-    <div class="card-body">
-
-      <?php do_action('woocommerce_login_form_start'); ?>
-
-      <?php echo ($message) ? wpautop(wptexturize($message)) : ''; // @codingStandardsIgnoreLine 
-      ?>
-
-      <p class="form-row form-row-first">
-        <label for="username"><?php esc_html_e('Username or email', 'woocommerce'); ?>&nbsp;<span class="required">*</span></label>
-        <input type="text" class="input-text form-control" name="username" id="username" autocomplete="username" />
-      </p>
-      <p class="form-row form-row-last">
-        <label for="password"><?php esc_html_e('Password', 'woocommerce'); ?>&nbsp;<span class="required">*</span></label>
-        <input class="input-text form-control" type="password" name="password" id="password" autocomplete="current-password" />
-      </p>
-      <div class="clear"></div>
-
-      <?php do_action('woocommerce_login_form'); ?>
-
-      <div class="form-check mb-3">
-        <input name="rememberme" type="checkbox" class="form-check-input" id="rememberme" value="forever" />
-        <label class="form-check-label" for="rememberme"><?php _e('Remember me', 'woocommerce'); ?></label>
-      </div>
-
-      <p class="form-row">
-        <?php wp_nonce_field('woocommerce-login', 'woocommerce-login-nonce'); ?>
-        <input type="hidden" name="redirect" value="<?php echo esc_url($redirect) ?>" />
-        <button type="submit" class="btn btn-outline-primary woocommerce-form-login__submit<?php echo esc_attr( wc_wp_theme_get_element_class_name( 'button' ) ? ' ' . wc_wp_theme_get_element_class_name( 'button' ) : '' ); ?>" name="login" value="<?php esc_attr_e( 'Login', 'woocommerce' ); ?>"><?php esc_html_e( 'Login', 'woocommerce' ); ?></button>
-      </p>
-      <p class="lost_password mt-3 mb-0">
-        <a href="<?php echo esc_url(wp_lostpassword_url()); ?>"><?php esc_html_e('Lost your password?', 'woocommerce'); ?></a>
-      </p>
-
-      <div class="clear"></div>
-
-      <?php do_action('woocommerce_login_form_end'); ?>
-
-    </div><!-- card-body -->
-
-  </div><!-- card -->
-
-</form>
\ No newline at end of file