diff --git a/public/passkey/passkey.js b/public/passkey/passkey.js
index 8cc55c2..e0b3630 100644
--- a/public/passkey/passkey.js
+++ b/public/passkey/passkey.js
@@ -212,7 +212,10 @@ async function passkey_check(csrf_token,redirect)
 					console.log('Passkey: Process Success');
 
 				// Direct to the home page
-				window.location.href = (redirect !== undefined) ? redirect : '/';
+				if (data.success)
+					window.location.href = (redirect !== undefined) ? redirect : '/';
+				else
+					alert(data.msg || 'Unknown error occurred');
 			},
 			error: function(e,status,error) {
 				throw new Error(status || 'Unknown error occurred');
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index bfb4908..8b5270a 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -73,14 +73,22 @@
 					</div>
 
 					<div class="row">
-						<div class="col-12">
-							<a class="link-danger" href="{{ url('password/reset') }}">Forgot Password</a>
-						</div>
-					</div>
+						<div class="col-lg-6 col-12">
+							<div class="row">
+								<div class="col-12">
+									<a class="link-danger" href="{{ url('password/reset') }}">Forgot Password</a>
+								</div>
+							</div>
 
-					<div class="row">
-						<div class="col-12">
-							<a class="link-danger" href="{{ url('register') }}">Register</a>
+							<div class="row">
+								<div class="col-12">
+									<a class="link-danger" href="{{ url('register') }}">Register</a>
+								</div>
+							</div>
+						</div>
+
+						<div class="col-lg-6 col-12">
+							<button type="submit" id="passkey" name="submit" class="btn btn-primary float-end"><i class="bi bi-key"></i> Passkey</button>
 						</div>
 					</div>
 				</div>
@@ -94,6 +102,11 @@
 	<script type='text/javascript' src='{{ asset('/passkey/passkey.js') }}'></script>
 
 	<script type="text/javascript">
-		passkey_check('{{ csrf_token() }}','{{ back()->getTargetUrl() }}');
+		$(document).ready(function() {
+			$('#passkey').on('click',function() {
+				passkey_check('{{ csrf_token() }}','{{ back()->getTargetUrl() }}');
+				return false;
+			});
+		});
 	</script>
 @append
\ No newline at end of file