diff --git a/locales/bg-BG.json b/locales/bg-BG.json
index 6f74bba1a30..be40f31e88b 100644
--- a/locales/bg-BG.json
+++ b/locales/bg-BG.json
@@ -421,7 +421,8 @@
       "title": "Влизане",
       "sign_in": "Влизане",
       "submit": "Изпрати",
-      "create_account": "Създаване на профил"
+      "create_account": "Създаване на профил",
+      "alternate_provider_separator": "или"
     },
     "orders": {
       "order_number": "Поръчка",
diff --git a/locales/cs.json b/locales/cs.json
index 7e6620fdf70..de225dbd249 100644
--- a/locales/cs.json
+++ b/locales/cs.json
@@ -451,7 +451,8 @@
       "password": "Heslo",
       "title": "Přihlášení",
       "sign_in": "Přihlásit se",
-      "submit": "Odeslat"
+      "submit": "Odeslat",
+      "alternate_provider_separator": "nebo"
     },
     "orders": {
       "title": "Historie objednávek",
diff --git a/locales/da.json b/locales/da.json
index 2168fd07203..161ae2ffe5c 100644
--- a/locales/da.json
+++ b/locales/da.json
@@ -427,7 +427,8 @@
       "password": "Adgangskode",
       "title": "Login",
       "sign_in": "Log ind",
-      "submit": "Indsend"
+      "submit": "Indsend",
+      "alternate_provider_separator": "eller"
     },
     "orders": {
       "title": "Ordrehistorik",
diff --git a/locales/de.json b/locales/de.json
index f517f015eea..e60f8fc79a6 100644
--- a/locales/de.json
+++ b/locales/de.json
@@ -427,7 +427,8 @@
       "password": "Passwort",
       "title": "Login",
       "sign_in": "Anmelden",
-      "submit": "Senden"
+      "submit": "Senden",
+      "alternate_provider_separator": "oder"
     },
     "orders": {
       "title": "Bestellhistorie",
diff --git a/locales/el.json b/locales/el.json
index eb3179dfb4e..8253cd7d593 100644
--- a/locales/el.json
+++ b/locales/el.json
@@ -427,7 +427,8 @@
       "password": "Κωδικός πρόσβασης",
       "title": "Σύνδεση",
       "sign_in": "Σύνδεση",
-      "submit": "Υποβολή"
+      "submit": "Υποβολή",
+      "alternate_provider_separator": "ή"
     },
     "orders": {
       "title": "Ιστορικό παραγγελιών",
diff --git a/locales/en.default.json b/locales/en.default.json
index 03e4223996e..523714e5c47 100644
--- a/locales/en.default.json
+++ b/locales/en.default.json
@@ -428,7 +428,8 @@
       "password": "Password",
       "title": "Login",
       "sign_in": "Sign in",
-      "submit": "Submit"
+      "submit": "Submit",
+      "alternate_provider_separator": "or"
     },
     "order": {
       "title": "Order {{ name }}",
diff --git a/locales/en.default.schema.json b/locales/en.default.schema.json
index 394d1794f90..0957b3a22d3 100644
--- a/locales/en.default.schema.json
+++ b/locales/en.default.schema.json
@@ -1909,7 +1909,10 @@
       }
     },
     "main-login": {
-      "name": "Login"
+      "name": "Login",
+      "shop_login_button": {
+        "enable": "Enable Sign in with Shop"
+      }
     },
     "main-order": {
       "name": "Order"
diff --git a/locales/es.json b/locales/es.json
index 399af5513ed..2c08844e079 100644
--- a/locales/es.json
+++ b/locales/es.json
@@ -439,7 +439,8 @@
       "password": "Contraseña",
       "title": "Inicio de sesión",
       "sign_in": "Iniciar sesión",
-      "submit": "Enviar"
+      "submit": "Enviar",
+      "alternate_provider_separator": "o"
     },
     "orders": {
       "title": "Historial de pedidos",
diff --git a/locales/fi.json b/locales/fi.json
index 9e815335291..de8fce4cec5 100644
--- a/locales/fi.json
+++ b/locales/fi.json
@@ -427,7 +427,8 @@
       "password": "Salasana",
       "title": "Kirjautuminen",
       "sign_in": "Kirjaudu sisään",
-      "submit": "Lähetä"
+      "submit": "Lähetä",
+      "alternate_provider_separator": "tai"
     },
     "orders": {
       "title": "Tilaushistoria",
diff --git a/locales/fi.schema.json b/locales/fi.schema.json
index 914c734446b..85f6e3527de 100644
--- a/locales/fi.schema.json
+++ b/locales/fi.schema.json
@@ -3123,7 +3123,10 @@
       "name": "Osoitteet"
     },
     "main-login": {
-      "name": "Kirjautuminen"
+      "name": "Kirjautuminen",
+      "shop_login_button": {
+        "enable": "Ota käyttöön kirjautuminen Shopilla"
+      }
     },
     "main-order": {
       "name": "Tilaus"
diff --git a/locales/fr.json b/locales/fr.json
index 07bea398d46..b4a7f36bc57 100644
--- a/locales/fr.json
+++ b/locales/fr.json
@@ -439,7 +439,8 @@
       "password": "Mot de passe",
       "title": "Connexion",
       "sign_in": "Connexion",
-      "submit": "Envoyer"
+      "submit": "Envoyer",
+      "alternate_provider_separator": "ou"
     },
     "orders": {
       "title": "Historique des commandes",
diff --git a/locales/hr-HR.json b/locales/hr-HR.json
index b2b513b81bb..8cd1be36d85 100644
--- a/locales/hr-HR.json
+++ b/locales/hr-HR.json
@@ -439,7 +439,8 @@
       "password": "Lozinka",
       "title": "Prijava",
       "sign_in": "Registracija",
-      "submit": "Pošalji"
+      "submit": "Pošalji",
+      "alternate_provider_separator": "ili"
     },
     "orders": {
       "title": "Povijest narudžbe",
diff --git a/locales/hu.json b/locales/hu.json
index e918994da7c..552342fa638 100644
--- a/locales/hu.json
+++ b/locales/hu.json
@@ -427,7 +427,8 @@
       "password": "Jelszó",
       "title": "Felhasználónév",
       "sign_in": "Bejelentkezés",
-      "submit": "Küldés"
+      "submit": "Küldés",
+      "alternate_provider_separator": "vagy"
     },
     "orders": {
       "title": "Korábbi rendelések",
diff --git a/locales/id.json b/locales/id.json
index f8b0b294997..547e0dfbbf6 100644
--- a/locales/id.json
+++ b/locales/id.json
@@ -427,7 +427,8 @@
       "password": "Sandi",
       "title": "Login",
       "sign_in": "Masuk",
-      "submit": "Kirim"
+      "submit": "Kirim",
+      "alternate_provider_separator": "atau"
     },
     "orders": {
       "title": "Riwayat pesanan",
diff --git a/locales/it.json b/locales/it.json
index 23092488b21..a8f7a554a2f 100644
--- a/locales/it.json
+++ b/locales/it.json
@@ -439,7 +439,8 @@
       "password": "Password",
       "title": "Accedi",
       "sign_in": "Accedi",
-      "submit": "Invia"
+      "submit": "Invia",
+      "alternate_provider_separator": "oppure"
     },
     "order": {
       "title": "Ordine {{ name }}",
diff --git a/locales/ja.json b/locales/ja.json
index b23ac1490b5..88e12204bd6 100644
--- a/locales/ja.json
+++ b/locales/ja.json
@@ -427,7 +427,8 @@
       "password": "パスワード",
       "title": "ログイン",
       "sign_in": "ログイン",
-      "submit": "送信"
+      "submit": "送信",
+      "alternate_provider_separator": "または"
     },
     "orders": {
       "title": "注文履歴",
diff --git a/locales/ja.schema.json b/locales/ja.schema.json
index 4be0ec07b59..fa4b408c287 100644
--- a/locales/ja.schema.json
+++ b/locales/ja.schema.json
@@ -3123,7 +3123,10 @@
       "name": "アドレス"
     },
     "main-login": {
-      "name": "ログイン"
+      "name": "ログイン",
+      "shop_login_button": {
+        "enable": "[Shopにログインする] を有効にする"
+      }
     },
     "main-order": {
       "name": "注文"
diff --git a/locales/ko.json b/locales/ko.json
index ce78b74c579..89f6113cc4a 100644
--- a/locales/ko.json
+++ b/locales/ko.json
@@ -427,7 +427,8 @@
       "password": "비밀번호",
       "title": "로그인",
       "sign_in": "로그인",
-      "submit": "제출"
+      "submit": "제출",
+      "alternate_provider_separator": "또는"
     },
     "orders": {
       "title": "주문 기록",
diff --git a/locales/lt-LT.json b/locales/lt-LT.json
index fc54345864f..75eaa104d05 100644
--- a/locales/lt-LT.json
+++ b/locales/lt-LT.json
@@ -451,7 +451,8 @@
       "password": "Slaptažodis",
       "title": "Prisijungimo vardas",
       "sign_in": "Prisijungti",
-      "submit": "Pateikti"
+      "submit": "Pateikti",
+      "alternate_provider_separator": "arba"
     },
     "order": {
       "title": "Užsakymas {{ name }}",
diff --git a/locales/nb.json b/locales/nb.json
index af4a5d3112f..c3ca788379a 100644
--- a/locales/nb.json
+++ b/locales/nb.json
@@ -427,7 +427,8 @@
       "password": "Passord",
       "title": "Logg på",
       "sign_in": "Logg inn",
-      "submit": "Send inn"
+      "submit": "Send inn",
+      "alternate_provider_separator": "eller"
     },
     "order": {
       "title": "Bestilling {{ name }}",
diff --git a/locales/nl.json b/locales/nl.json
index c40257a2a00..e5b7c0dc116 100644
--- a/locales/nl.json
+++ b/locales/nl.json
@@ -427,7 +427,8 @@
       "password": "Wachtwoord",
       "title": "Inloggegevens",
       "sign_in": "Inloggen",
-      "submit": "Verzenden"
+      "submit": "Verzenden",
+      "alternate_provider_separator": "of"
     },
     "orders": {
       "title": "Besteloverzicht",
diff --git a/locales/pl.json b/locales/pl.json
index f3e975d8a5c..957ae862d64 100644
--- a/locales/pl.json
+++ b/locales/pl.json
@@ -451,7 +451,8 @@
       "password": "Hasło",
       "title": "Login",
       "sign_in": "Zaloguj się",
-      "submit": "Prześlij"
+      "submit": "Prześlij",
+      "alternate_provider_separator": "lub"
     },
     "order": {
       "title": "Zamówienie {{ name }}",
diff --git a/locales/pt-BR.json b/locales/pt-BR.json
index d4f02e2a325..6f1f13d6c15 100644
--- a/locales/pt-BR.json
+++ b/locales/pt-BR.json
@@ -439,7 +439,8 @@
       "password": "Senha",
       "title": "Fazer login",
       "sign_in": "Fazer login",
-      "submit": "Enviar"
+      "submit": "Enviar",
+      "alternate_provider_separator": "ou"
     },
     "orders": {
       "title": "Histórico de pedidos",
diff --git a/locales/pt-PT.json b/locales/pt-PT.json
index ed97b87f181..f819cf8fcfc 100644
--- a/locales/pt-PT.json
+++ b/locales/pt-PT.json
@@ -439,7 +439,8 @@
       "password": "Palavra-passe",
       "title": "Iniciar sessão",
       "sign_in": "Iniciar sessão",
-      "submit": "Submeter"
+      "submit": "Submeter",
+      "alternate_provider_separator": "ou"
     },
     "order": {
       "title": "Encomenda {{ name }}",
diff --git a/locales/ro-RO.json b/locales/ro-RO.json
index 1f432bb3757..99bf0a94a32 100644
--- a/locales/ro-RO.json
+++ b/locales/ro-RO.json
@@ -439,7 +439,8 @@
       "password": "Parolă",
       "title": "Conectați-vă",
       "sign_in": "Conectați-vă",
-      "submit": "Trimiteți"
+      "submit": "Trimiteți",
+      "alternate_provider_separator": "sau"
     },
     "orders": {
       "title": "Istoric comenzi",
diff --git a/locales/ru.json b/locales/ru.json
index 8f9153f2e7e..c08423b29a2 100644
--- a/locales/ru.json
+++ b/locales/ru.json
@@ -451,7 +451,8 @@
       "password": "Пароль",
       "title": "Вход",
       "sign_in": "Войти в систему",
-      "submit": "Отправить"
+      "submit": "Отправить",
+      "alternate_provider_separator": "или"
     },
     "orders": {
       "title": "История заказов",
diff --git a/locales/sk-SK.json b/locales/sk-SK.json
index ca2712259ac..0300c17e1d2 100644
--- a/locales/sk-SK.json
+++ b/locales/sk-SK.json
@@ -451,7 +451,8 @@
       "password": "Heslo",
       "title": "Prihlásiť sa",
       "sign_in": "Prihlásiť sa",
-      "submit": "Odoslať"
+      "submit": "Odoslať",
+      "alternate_provider_separator": "alebo"
     },
     "orders": {
       "title": "História objednávok",
diff --git a/locales/sl-SI.json b/locales/sl-SI.json
index ec211fab99d..094634384e8 100644
--- a/locales/sl-SI.json
+++ b/locales/sl-SI.json
@@ -451,7 +451,8 @@
       "password": "Geslo",
       "title": "Prijava",
       "sign_in": "Vpis",
-      "submit": "Pošlji"
+      "submit": "Pošlji",
+      "alternate_provider_separator": "ali"
     },
     "order": {
       "title": "Naročilo {{ name }}",
diff --git a/locales/sv.json b/locales/sv.json
index b949b9f4837..e06b87390a2 100644
--- a/locales/sv.json
+++ b/locales/sv.json
@@ -427,7 +427,8 @@
       "password": "Lösenord",
       "title": "Inloggning",
       "sign_in": "Logga in",
-      "submit": "Skicka"
+      "submit": "Skicka",
+      "alternate_provider_separator": "eller"
     },
     "orders": {
       "title": "Orderhistorik",
diff --git a/locales/th.json b/locales/th.json
index 53aa855be06..53f52e80930 100644
--- a/locales/th.json
+++ b/locales/th.json
@@ -427,7 +427,8 @@
       "password": "รหัสผ่าน",
       "title": "การเข้าสู่ระบบ",
       "sign_in": "ลงชื่อเข้าใช้",
-      "submit": "ส่ง"
+      "submit": "ส่ง",
+      "alternate_provider_separator": "หรือ"
     },
     "orders": {
       "title": "ประวัติคำสั่งซื้อ",
diff --git a/locales/th.schema.json b/locales/th.schema.json
index 1e3e158d6c1..fba582497db 100644
--- a/locales/th.schema.json
+++ b/locales/th.schema.json
@@ -3123,7 +3123,10 @@
       "name": "ที่อยู่"
     },
     "main-login": {
-      "name": "เข้าสู่ระบบ"
+      "name": "เข้าสู่ระบบ",
+      "shop_login_button": {
+        "enable": "เปิดใช้การลงชื่อเข้าใช้ด้วย Shop"
+      }
     },
     "main-order": {
       "name": "คำสั่งซื้อ"
diff --git a/locales/tr.json b/locales/tr.json
index e5dec9e6201..30e1452f875 100644
--- a/locales/tr.json
+++ b/locales/tr.json
@@ -427,7 +427,8 @@
       "password": "Parola",
       "title": "Oturum aç",
       "sign_in": "Giriş yapın",
-      "submit": "Gönder"
+      "submit": "Gönder",
+      "alternate_provider_separator": "veya"
     },
     "orders": {
       "title": "Sipariş geçmişi",
diff --git a/locales/vi.json b/locales/vi.json
index 7816fc73919..ac1c61b31d8 100644
--- a/locales/vi.json
+++ b/locales/vi.json
@@ -427,7 +427,8 @@
       "password": "Mật khẩu",
       "title": "Đăng nhập",
       "sign_in": "Đăng nhập",
-      "submit": "Gửi"
+      "submit": "Gửi",
+      "alternate_provider_separator": "hoặc"
     },
     "orders": {
       "title": "Lịch sử đặt hàng",
diff --git a/locales/zh-CN.json b/locales/zh-CN.json
index 0363f7da53d..75e0a6312ed 100644
--- a/locales/zh-CN.json
+++ b/locales/zh-CN.json
@@ -427,7 +427,8 @@
       "password": "密码",
       "title": "登录",
       "sign_in": "登录",
-      "submit": "提交"
+      "submit": "提交",
+      "alternate_provider_separator": "或"
     },
     "orders": {
       "title": "订单历史记录",
diff --git a/locales/zh-CN.schema.json b/locales/zh-CN.schema.json
index 4f43c353fd3..1adb1cd086f 100644
--- a/locales/zh-CN.schema.json
+++ b/locales/zh-CN.schema.json
@@ -3123,7 +3123,10 @@
       "name": "地址"
     },
     "main-login": {
-      "name": "登录"
+      "name": "登录",
+      "shop_login_button": {
+        "enable": "启用使用 Shop 登录"
+      }
     },
     "main-order": {
       "name": "订单"
diff --git a/locales/zh-TW.json b/locales/zh-TW.json
index 2660f48e135..f8efb9aed0a 100644
--- a/locales/zh-TW.json
+++ b/locales/zh-TW.json
@@ -427,7 +427,8 @@
       "password": "密碼",
       "title": "登入",
       "sign_in": "登入",
-      "submit": "提交"
+      "submit": "提交",
+      "alternate_provider_separator": "或者"
     },
     "orders": {
       "title": "訂單記錄",
diff --git a/sections/main-login.liquid b/sections/main-login.liquid
index d1548d2bca1..fb07886870d 100644
--- a/sections/main-login.liquid
+++ b/sections/main-login.liquid
@@ -14,6 +14,10 @@
   }
 {%- endstyle -%}
 
+{%- if section.settings.enable_shop_login_button == false -%}
+  {%- assign hide_shop_login_button = true -%}
+{%- endif -%}
+
 <div class="customer login section-{{ section.id }}-padding">
   <h1 id="recover" tabindex="-1">
     {{ 'customer.recover_password.title' | t }}
@@ -96,6 +100,16 @@
         {{ form.errors | default_errors }}
       {%- endif -%}
 
+      <section name="sign-in-with-shop-provider">
+        {{ shop | login_button: hide_button: hide_shop_login_button }}
+
+        {%- unless hide_shop_login_button -%}
+          <p>
+            {{ 'customer.login_page.alternate_provider_separator' | t }}
+          </p>
+        {%- endunless -%}
+      </section>
+
       <div class="field">
         <input
           type="email"
@@ -165,6 +179,12 @@
 {
   "name": "t:sections.main-login.name",
   "settings": [
+    {
+      "type": "checkbox",
+      "id": "enable_shop_login_button",
+      "label": "t:sections.main-login.shop_login_button.enable",
+      "default": true
+    },
     {
       "type": "header",
       "content": "t:sections.all.padding.section_padding_heading"