diff --git a/app/Http/Controllers/Auth/LoginEmailController.php b/app/Http/Controllers/Auth/LoginEmailController.php
new file mode 100644
index 0000000..9536edb
--- /dev/null
+++ b/app/Http/Controllers/Auth/LoginEmailController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class LoginEmailController extends Controller
+{
+    public function index()
+    {
+        return view('account.signin-email');
+    }
+}
diff --git a/app/Http/Controllers/Auth/LoginWaController.php b/app/Http/Controllers/Auth/LoginWaController.php
new file mode 100644
index 0000000..c7e5a58
--- /dev/null
+++ b/app/Http/Controllers/Auth/LoginWaController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class LoginWaController extends Controller
+{
+    public function index()
+    {
+        return view('account.signin');
+    }
+}
diff --git a/lang/en/signin.php b/lang/en/signin.php
new file mode 100644
index 0000000..774217b
--- /dev/null
+++ b/lang/en/signin.php
@@ -0,0 +1,36 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Signin Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during signin for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'title' => 'Welcome back',
+    'no_account' => "Don't have an account?",
+    'create_account' => 'Create an account',
+    'email_placeholder' => 'Email',
+    'email_invalid' => 'Enter a valid email address!',
+    'phone_placeholder' => 'Phone Number',
+    'phone_invalid' => 'Enter a valid phone number!',
+    'password_placeholder' => 'Password',
+    'password_incorrect' => 'Password is incorrect!',
+    'remember_for_30_days' => 'Remember for 30 days',
+    'forgot_password' => 'Forgot password?',
+    'login_with_email' => 'Login with email',
+    'login_with_phone' => 'Login with phone',
+    'sign_in' => 'Sign In',
+    'or_continue_with' => 'or continue with',
+    'google' => 'Google',
+    'facebook' => 'Facebook',
+    'apple' => 'Apple',
+    'need_help' => 'Need help?',
+    'rights_reserved' => '© All rights reserved. Made by :company',
+    'company_name' => 'Coderthemes',
+];
diff --git a/lang/id/signin.php b/lang/id/signin.php
new file mode 100644
index 0000000..63595f9
--- /dev/null
+++ b/lang/id/signin.php
@@ -0,0 +1,37 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Signin Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during signin for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'title' => 'Selamat datang kembali',
+    'no_account' => 'Belum punya akun?',
+    'create_account' => 'Buat akun',
+    'email_placeholder' => 'Email',
+    'email_invalid' => 'Masukkan alamat email yang valid!',
+    'phone_placeholder' => 'Nomor Telepon',
+    'phone_invalid' => 'Masukkan nomor telepon yang valid!',
+    'password_placeholder' => 'Kata Sandi',
+    'password_incorrect' => 'Kata sandi salah!',
+    'remember_for_30_days' => 'Ingat selama 30 hari',
+    'forgot_password' => 'Lupa kata sandi?',
+    'login_with_email' => 'Login dengan email',
+    'login_with_phone' => 'Login dengan telepon',
+    'sign_in' => 'Masuk',
+    'or_continue_with' => 'atau lanjutkan dengan',
+    'google' => 'Google',
+    'facebook' => 'Facebook',
+    'apple' => 'Apple',
+    'need_help' => 'Butuh bantuan?',
+    'rights_reserved' => ' Semua hak dilindungi. Dibuat oleh :company',
+    'rights_reserved' => '© Semua hak dilindungi. Dibuat oleh :company',
+    'company_name' => 'Coderthemes',
+];
\ No newline at end of file
diff --git a/resources/views/account/signin-email.blade.php b/resources/views/account/signin-email.blade.php
new file mode 100644
index 0000000..a5b6baa
--- /dev/null
+++ b/resources/views/account/signin-email.blade.php
@@ -0,0 +1,91 @@
+@extends('layouts.landing', ['title' => 'Account - Sign In'])
+
+@section('content')
+    <main class="content-wrapper w-100 px-3 ps-lg-5 pe-lg-4 mx-auto" style="max-width: 1920px">
+        <div class="d-lg-flex">
+            <!-- Login form + Footer -->
+            <div class="d-flex flex-column min-vh-100 w-100 py-4 mx-auto me-lg-5" style="max-width: 416px">
+                <!-- Logo -->
+                <header class="navbar px-0 pb-4 mt-n2 mt-sm-0 mb-2 mb-md-3 mb-lg-4">
+                    <a class="navbar-brand pt-0" href="/">
+                        <span class="d-flex flex-shrink-0 text-primary me-2">
+                            <svg height="36" width="36" xmlns="http://www.w3.org/2000/svg">
+                                <path
+                                    d="M36 18.01c0 8.097-5.355 14.949-12.705 17.2a18.12 18.12 0 0 1-5.315.79C9.622 36 2.608 30.313.573 22.611.257 21.407.059 20.162 0 18.879v-1.758c.02-.395.059-.79.099-1.185.099-.908.277-1.817.514-2.686C2.687 5.628 9.682 0 18 0c5.572 0 10.551 2.528 13.871 6.517 1.502 1.797 2.648 3.91 3.359 6.201.494 1.659.771 3.436.771 5.292z"
+                                    fill="currentColor"></path>
+                                <g fill="#fff">
+                                    <path
+                                        d="M17.466 21.624c-.514 0-.988-.316-1.146-.829-.198-.632.138-1.303.771-1.501l7.666-2.469-1.205-8.254-13.317 4.621a1.19 1.19 0 0 1-1.521-.75 1.19 1.19 0 0 1 .751-1.521l13.89-4.818c.553-.197 1.166-.138 1.64.158a1.82 1.82 0 0 1 .85 1.284l1.344 9.183c.138.987-.494 1.994-1.482 2.33l-7.864 2.528-.375.04zm7.31.138c-.178-.632-.85-1.007-1.482-.81l-5.177 1.58c-2.331.79-3.28.02-3.418-.099l-6.56-8.412a4.25 4.25 0 0 0-4.406-1.758l-3.122.987c-.237.889-.415 1.777-.514 2.686l4.228-1.363a1.84 1.84 0 0 1 1.857.81l6.659 8.551c.751.948 2.015 1.323 3.359 1.323.909 0 1.857-.178 2.687-.474l5.078-1.54c.632-.178 1.008-.829.81-1.481z">
+                                    </path>
+                                    <use href="#czlogo"></use>
+                                    <use href="#czlogo" x="8.516" y="-2.172"></use>
+                                </g>
+                                <defs>
+                                    <path
+                                        d="M18.689 28.654a1.94 1.94 0 0 1-1.936 1.935 1.94 1.94 0 0 1-1.936-1.935 1.94 1.94 0 0 1 1.936-1.935 1.94 1.94 0 0 1 1.936 1.935z"
+                                        id="czlogo"></path>
+                                </defs>
+                            </svg>
+                        </span>
+                        AsiaGolf
+                    </a>
+                </header>
+                <h1 class="h2 mt-auto">{{ __('signin.title') }}</h1>
+                <div class="nav fs-sm mb-4">
+                    {{ __('signin.no_account') }}
+                    <a class="nav-link text-decoration-underline p-0 ms-2"
+                        href="{{ route('register') }}">{{ __('signin.create_account') }}</a>
+                </div>
+                <!-- Form -->
+                <form class="needs-validation" novalidate="">
+                    <div class="position-relative mb-4">
+                        <input class="form-control form-control-lg" placeholder="{{ __('signin.email_placeholder') }}" required="" type="email" />
+                        <div class="invalid-tooltip bg-transparent py-0">{{ __('signin.email_invalid') }}</div>
+                    </div>
+                    
+                    <div class="d-flex align-items-center justify-content-end mb-4">
+                        {{-- <div class="form-check me-2">
+                            <input class="form-check-input" id="remember-30" type="checkbox" />
+                            <label class="form-check-label" for="remember-30">{{ __('signin.remember_for_30_days') }}</label>
+                        </div> --}}
+                        <div class="nav">
+                            <a class="nav-link animate-underline p-0"
+                                href="{{ route('login') }}">
+                                <span class="animate-target">{{ __('signin.login_with_phone') }}</span>
+                            </a>
+                        </div>
+                    </div>
+                    <button class="btn btn-lg btn-primary w-100" type="submit">{{ __('signin.sign_in') }}</button>
+                </form>
+                <x-social-login />
+                <!-- Footer -->
+                <footer class="mt-auto">
+                    <div class="nav mb-4">
+                        <a class="nav-link text-decoration-underline p-0"
+                            href="{{ route('second', ['help', 'topics-v1']) }}">{{ __('signin.need_help') }}</a>
+                    </div>
+                    <p class="fs-xs mb-0">
+                        © All rights reserved. Made by <span class="animate-underline"><a
+                                class="animate-target text-dark-emphasis text-decoration-none"
+                                href="https://coderthemes.com/" rel="noreferrer" target="_blank">{{ __('signin.company_name') }}</a></span>
+                    </p>
+                </footer>
+            </div>
+            <!-- Cover image visible on screens > 992px wide (lg breakpoint) -->
+            <div class="d-none d-lg-block w-100 py-4 ms-auto" style="max-width: 1034px">
+                <div class="d-flex flex-column justify-content-end h-100 rounded-5 overflow-hidden">
+                    <span class="position-absolute top-0 start-0 w-100 h-100 d-none-dark"
+                        style="background: linear-gradient(-90deg, #accbee 0%, #e7f0fd 100%)"></span>
+                    <span class="position-absolute top-0 start-0 w-100 h-100 d-none d-block-dark"
+                        style="background: linear-gradient(-90deg, #1b273a 0%, #1f2632 100%)"></span>
+                    <div class="ratio position-relative z-2" style="--cz-aspect-ratio: calc(1030 / 1032 * 100%)">
+                        <img alt="Girl" src="/img/account/cover.png" />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </main>
+@endsection
+
+@section('scripts')
+@endsection
diff --git a/resources/views/account/signin.blade.php b/resources/views/account/signin.blade.php
index 5859700..ead7dad 100644
--- a/resources/views/account/signin.blade.php
+++ b/resources/views/account/signin.blade.php
@@ -30,73 +30,44 @@
                         AsiaGolf
                     </a>
                 </header>
-                <h1 class="h2 mt-auto">Welcome back</h1>
+                <h1 class="h2 mt-auto">{{ __('signin.title') }}</h1>
                 <div class="nav fs-sm mb-4">
-                    Don't have an account?
+                    {{ __('signin.no_account') }}
                     <a class="nav-link text-decoration-underline p-0 ms-2"
-                        href="{{ route('second', ['account', 'signup']) }}">Create an account</a>
+                        href="{{ route('register') }}">{{ __('signin.create_account') }}</a>
                 </div>
                 <!-- Form -->
                 <form class="needs-validation" novalidate="">
                     <div class="position-relative mb-4">
-                        <input class="form-control form-control-lg" placeholder="Email" required="" type="email" />
-                        <div class="invalid-tooltip bg-transparent py-0">Enter a valid email address!</div>
+                        <input class="form-control form-control-lg" placeholder="{{ __('signin.phone_placeholder') }}" required="" type="tel" />
+                        <div class="invalid-tooltip bg-transparent py-0">{{ __('signin.phone_invalid') }}</div>
                     </div>
-                    <div class="mb-4">
-                        <div class="password-toggle">
-                            <input class="form-control form-control-lg" placeholder="Password" required=""
-                                type="password" />
-                            <div class="invalid-tooltip bg-transparent py-0">Password is incorrect!</div>
-                            <label aria-label="Show/hide password" class="password-toggle-button fs-lg">
-                                <input class="btn-check" type="checkbox" />
-                            </label>
-                        </div>
-                    </div>
-                    <div class="d-flex align-items-center justify-content-between mb-4">
-                        <div class="form-check me-2">
+                    
+                    <div class="d-flex align-items-center justify-content-end mb-4">
+                        {{-- <div class="form-check me-2">
                             <input class="form-check-input" id="remember-30" type="checkbox" />
-                            <label class="form-check-label" for="remember-30">Remember for 30 days</label>
-                        </div>
+                            <label class="form-check-label" for="remember-30">{{ __('signin.remember_for_30_days') }}</label>
+                        </div> --}}
                         <div class="nav">
                             <a class="nav-link animate-underline p-0"
-                                href="{{ route('second', ['account', 'password-recovery']) }}">
-                                <span class="animate-target">Forgot password?</span>
+                                href="{{ route('login-email') }}">
+                                <span class="animate-target">{{ __('signin.login_with_email') }}</span>
                             </a>
                         </div>
                     </div>
-                    <button class="btn btn-lg btn-primary w-100" type="submit">Sign In</button>
+                    <button class="btn btn-lg btn-primary w-100" type="submit">{{ __('signin.sign_in') }}</button>
                 </form>
-                <!-- Divider -->
-                <div class="d-flex align-items-center my-4">
-                    <hr class="w-100 m-0" />
-                    <span class="text-body-emphasis fw-medium text-nowrap mx-4">or continue with</span>
-                    <hr class="w-100 m-0" />
-                </div>
-                <!-- Social login -->
-                <div class="d-flex flex-column flex-sm-row gap-3 pb-4 mb-3 mb-lg-4">
-                    <button class="btn btn-lg btn-outline-secondary w-100 px-2" type="button">
-                        <i class="ci-google ms-1 me-1"></i>
-                        Google
-                    </button>
-                    <button class="btn btn-lg btn-outline-secondary w-100 px-2" type="button">
-                        <i class="ci-facebook ms-1 me-1"></i>
-                        Facebook
-                    </button>
-                    <button class="btn btn-lg btn-outline-secondary w-100 px-2" type="button">
-                        <i class="ci-apple ms-1 me-1"></i>
-                        Apple
-                    </button>
-                </div>
+                <x-social-login />
                 <!-- Footer -->
                 <footer class="mt-auto">
                     <div class="nav mb-4">
                         <a class="nav-link text-decoration-underline p-0"
-                            href="{{ route('second', ['help', 'topics-v1']) }}">Need help?</a>
+                            href="{{ route('second', ['help', 'topics-v1']) }}">{{ __('signin.need_help') }}</a>
                     </div>
                     <p class="fs-xs mb-0">
                         © All rights reserved. Made by <span class="animate-underline"><a
                                 class="animate-target text-dark-emphasis text-decoration-none"
-                                href="https://coderthemes.com/" rel="noreferrer" target="_blank">Coderthemes</a></span>
+                                href="https://coderthemes.com/" rel="noreferrer" target="_blank">{{ __('signin.company_name') }}</a></span>
                     </p>
                 </footer>
             </div>
diff --git a/resources/views/account/signup.blade.php b/resources/views/account/signup.blade.php
index 1b4fb68..e72fa82 100644
--- a/resources/views/account/signup.blade.php
+++ b/resources/views/account/signup.blade.php
@@ -15,7 +15,7 @@
                 <div class="nav fs-sm mb-3 mb-lg-4">
                     {{ __('signup.already_have_account') }}
                     <a class="nav-link text-decoration-underline p-0 ms-2"
-                        href="{{ route('second', ['account', 'signin']) }}">{{ __('signup.sign_in') }}</a>
+                        href="{{ route('login') }}">{{ __('signup.sign_in') }}</a>
                 </div>
                 <div class="nav fs-sm mb-4 d-lg-none">
                     <span class="me-2">{{ __('signup.uncertain_about_account') }}</span>
diff --git a/resources/views/components/social-login.blade.php b/resources/views/components/social-login.blade.php
new file mode 100644
index 0000000..e857e2c
--- /dev/null
+++ b/resources/views/components/social-login.blade.php
@@ -0,0 +1,26 @@
+@props(['showDivider' => true])
+
+@if ($showDivider)
+    <!-- Divider -->
+    <div class="d-flex align-items-center my-4">
+        <hr class="w-100 m-0" />
+        <span class="text-body-emphasis fw-medium text-nowrap mx-4">{{ __('signin.or_continue_with') }}</span>
+        <hr class="w-100 m-0" />
+    </div>
+@endif
+
+<!-- Social login -->
+<div class="d-flex flex-column flex-sm-row gap-3 pb-4 mb-3 mb-lg-4">
+    <button class="btn btn-lg btn-outline-secondary w-100 px-2" type="button">
+        <i class="ci-google ms-1 me-1"></i>
+        {{ __('signin.google') }}
+    </button>
+    <button class="btn btn-lg btn-outline-secondary w-100 px-2" type="button">
+        <i class="ci-facebook ms-1 me-1"></i>
+        {{ __('signin.facebook') }}
+    </button>
+    <button class="btn btn-lg btn-outline-secondary w-100 px-2" type="button">
+        <i class="ci-apple ms-1 me-1"></i>
+        {{ __('signin.apple') }}
+    </button>
+</div>
diff --git a/routes/web.php b/routes/web.php
index 4bd60b9..0952d59 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,5 +1,7 @@
 <?php
 
+use App\Http\Controllers\Auth\LoginEmailController;
+use App\Http\Controllers\Auth\LoginWaController;
 use App\Http\Controllers\Auth\RegisterController;
 use App\Http\Controllers\HomeController;
 use Illuminate\Support\Facades\Route;
@@ -43,3 +45,6 @@ Route::get('/components/{component}', [ComponentController::class, 'load'])->nam
 
 Route::get('/register', [RegisterController::class, 'index'])->name('register');
 Route::post('/register', [RegisterController::class, 'register'])->name('register');
+
+Route::get('/login', [LoginWaController::class, 'index'])->name('login');
+Route::get('/login/email', [LoginEmailController::class, 'index'])->name('login-email');
\ No newline at end of file