diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7188cf0..2d771ee 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,6 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+            node-version: 20
+            cache: 'npm'
 
       - name: Compile Assets
         run: |
diff --git a/app/Providers/FortifyServiceProvider.php b/app/Providers/FortifyServiceProvider.php
index c5c87c1..53288a0 100644
--- a/app/Providers/FortifyServiceProvider.php
+++ b/app/Providers/FortifyServiceProvider.php
@@ -33,7 +33,7 @@ public function boot(): void
         Fortify::resetUserPasswordsUsing(ResetUserPassword::class);
 
         RateLimiter::for('login', function (Request $request) {
-            $email = (string)$request->email;
+            $email = (string)$request->username;
 
             return Limit::perMinute(5)->by($email . $request->ip());
         });
diff --git a/app/Providers/NukeServiceProvider.php b/app/Providers/NukeServiceProvider.php
index dd61d2c..bf0b704 100644
--- a/app/Providers/NukeServiceProvider.php
+++ b/app/Providers/NukeServiceProvider.php
@@ -37,7 +37,7 @@ public function register()
     public function boot()
     {
         RateLimiter::for('login', function (Request $request) {
-            $email = (string)$request->email;
+            $email = (string)$request->username;
 
             return Limit::perMinute(5)->by($email . $request->ip());
         });
@@ -70,8 +70,8 @@ public function boot()
                 return session()->put(['attempt-failed' => Lang::get('passwords.attempt'), 'end_time' => time() + 300]);
             }
 
-            $user = User::where('email', $request->email)
-                ->orWhere('username', $request->email)
+            $user = User::where('email', $request->username)
+                ->orWhere('username', $request->username)
                 ->first();
 
             if ($user && Hash::check($request->password, $user->password)) {
diff --git a/resources/views/auth/auth-login.blade.php b/resources/views/auth/auth-login.blade.php
index a425e9d..1592269 100644
--- a/resources/views/auth/auth-login.blade.php
+++ b/resources/views/auth/auth-login.blade.php
@@ -93,7 +93,7 @@ class="app-brand-text demo text-body fw-bold ms-1">Codebumble Inc.</span>
                                 @csrf
                                 <div class="mb-3">
                                     <label for="email" class="form-label">Email or Username</label>
-                                    <input type="text" class="form-control" id="email" name="email"
+                                    <input type="text" class="form-control" id="email" name="username"
                                         placeholder="Enter your email or username" autofocus>
                                 </div>
                                 <div class="mb-3 form-password-toggle">
diff --git a/resources/views/auth/auth-verify-email.blade.php b/resources/views/auth/auth-verify-email.blade.php
index 7caacd2..573fa8b 100644
--- a/resources/views/auth/auth-verify-email.blade.php
+++ b/resources/views/auth/auth-verify-email.blade.php
@@ -47,9 +47,41 @@ class="app-brand-text demo text-body fw-bold ms-1">Codebumble Inc.</span>
                         <!-- /Logo -->
 
                         @if (session('status') == 'verification-link-sent')
-                            <div class="alert alert-success p-1 text-center">
-                                A new email verification link has been emailed to you!
+
+                            <h2 class="card-title fw-bolder mb-1">Verify your email ✉️</h2>
+                            <p class="card-text mb-2">
+                                We've sent a link to your registered Email Address<span class="fw-bolder"></span> Please
+                                follow the
+                                link inside to continue.
+                            </p>
+
+                            <div class="alert alert-primary alert-dismissible d-flex align-items-baseline" role="alert">
+                                <span class="alert-icon alert-icon-lg text-primary me-2">
+                                    <i class="ti ti-send ti-sm"></i>
+                                </span>
+                                <div class="d-flex flex-column ps-1">
+                                    <h5 class="alert-heading mb-2">New Verification Mail Sent!</h5>
+                                    <p class="mb-0">We have sent a new Email Verification Link which is linked with this Account. Please Check Spam Box if you are unable to get it.</p>
+                                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
+                                    </button>
+                                </div>
                             </div>
+
+                            <p class="mt-2 text-center">
+                                <span>Didn't receive an email? </span>
+
+                            <form action="{{ route('verification.send') }}" method="POST">
+                                @csrf
+                                <button type="submit" class="btn btn-primary w-100">&nbsp;Resend</button>
+                            </form>
+
+                            <p class="mt-2 text-center">Or</p>
+
+                            <form action="{{ route('logout') }}" method="POST">
+                                @csrf
+                                <button type="submit" class="btn btn-primary w-100">&nbsp;Logout</button>
+                            </form>
+                            </p>
                         @else
                             <h2 class="card-title fw-bolder mb-1">Verify your email ✉️</h2>
                             <p class="card-text mb-2">