diff --git a/app/Controllers/Common_controller.php b/app/Controllers/Common_controller.php
index 7736a8d..d359fcd 100644
--- a/app/Controllers/Common_controller.php
+++ b/app/Controllers/Common_controller.php
@@ -151,12 +151,10 @@ class Common_controller extends BaseController
           $sendmail_controller = new Sendmail_controller();
 
           $sendmail_controller->index($this->request->getVar('email') , $otp , 2 ); 
+          $this->session->setTempdata('email', $this->request->getVar('email') ,3);
+          $this->session->setTempdata('otp', $otp ,3);
 
-          $data['status'] = 'success';
-
-          $data['otp'] = $otp;
-
-          echo json_encode($data);
+          return view('password_match.php');
 
         } 
 
@@ -164,9 +162,9 @@ class Common_controller extends BaseController
 
         {
 
-          $data['status'] = 'failed';
+          $this->session->setTempdata('error', "Email is not verified.please check your mail.",3);
 
-          echo json_encode($data);
+          return view('forgot_password_otp.php');
 
         }
 
diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 536d530..4c2efc0 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -657,7 +657,10 @@ class Member_controller extends BaseController
 
 					$this->session->setTempdata('error', "You entered wrong OTP.Please retry",3);
 
-					return view('forgot_password_otp.php');
+					$this->session->setTempdata('email', $this->request->getVar('email') ,3);
+					$this->session->setTempdata('otp', $this->request->getVar('verify_otp') ,3);
+
+					return view('password_match.php');
 
 				}
 
diff --git a/app/Views/forgot_password_otp.php b/app/Views/forgot_password_otp.php
index 4316e6f..5cbce17 100644
--- a/app/Views/forgot_password_otp.php
+++ b/app/Views/forgot_password_otp.php
@@ -23,9 +23,17 @@
     <div class="container">
         <div class="recovery-account">
             <h1>Account Recovery</h1>
-            <form id="form" method="post">
-            <input type="hidden" id="verify_otp" name="verify_otp" value="">
-            <input type="hidden" id="user" value="<?= session()->getTempdata('user'); ?>">
+            <form id="form" action="<?php
+            if (session()->getTempdata('user') == "member") 
+            {
+                echo base_url()."forgot_password";
+            } 
+            else 
+            {
+                echo base_url()."user_forgot_password";
+            }
+             
+            ?>" method="post">
                
             <div id="alert1"></div>
             <?php if(session()->getTempdata('error')):?>
@@ -38,14 +46,10 @@
                     <div class="col-12 mb-3">
                         <label for="email">Email Address</label>
                         <input type="email" id="email" name="email" class="form-control" placeholder="Enter your email id">
-                    </div>
-                    <div class="col-12 mb-4 disable" id="disable">
-                        <label for="email">OTP</label>
-                        <input type="text" id="otp" name="otp" class="form-control" placeholder="OTP">
-                    </div>    
+                    </div>  
                 </div> 
                 <div class="form-group mb-0 text-center" id="re-sub">
-                    <button id="submit1" class="forget-submit">Get OTP</button> 
+                    <button id="submit" class="forget-submit">Get OTP</button> 
                 </div>   
             </form>
         </div>    
@@ -53,55 +57,4 @@
 </section>    
 <?php include 'member_layout/footer.php' ?>
 </body>
-
-<script>
-// jQuery autohide element after 5 seconds
-$('#alert').delay(3000).fadeOut('slow');
-// This will disable just the div
-$(".disable").hide();
-
-$(document).on('click','#submit1',function(){
-    $('#alert1').html('Please wait...');
-    var email = $("#email").val();
-    var url;
-    var user_role = $('#user').val();
-    if ($('#user').val() == 'member') { url = "<?php echo base_url();?>forgot_password" } 
-    else { url = "<?php echo base_url();?>user_forgot_password" }
-    $.ajax({ 
-      type: "post",
-      url: url,
-      data: { email : email },
-      json: true,
-      success: function(response) {
-        response = jQuery.parseJSON(response);
-        if (response.status == "success") 
-        {
-            window.stop();
-            $("#form").attr('action', '<?php echo base_url();?>change_password_form');
-            $('#alert1').html('');
-            $(".disable").show();
-            $('#verify_otp').val(response.otp);
-            $("#re-sub").html('<button class="btn btn-primary btn-block" type="submit"> Submit </button>');
-        } 
-        else
-        {
-            window.stop();
-            $('#alert1').html('');
-            $('#alert1').addClass('alert alert-danger');
-            if (user_role == 'member') 
-            { 
-                $('#alert1').html('Email is not verified.please check your mail.'); 
-            } 
-            else 
-            { 
-                $('#alert1').html('Invalid email.'); 
-            }
-
-        }
-       
-      },
-      error: function(jqXHR, textStatus, err) { alert('text status '+textStatus+', err '+err) }
-    });
-});
-</script>
 </html>
\ No newline at end of file
diff --git a/app/Views/password_match.php b/app/Views/password_match.php
new file mode 100644
index 0000000..7122c6d
--- /dev/null
+++ b/app/Views/password_match.php
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>Forget Password - Golf Evolution</title>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="icon" href="<?= base_url()."/public/"; ?>assets/member_images/favicon.png" sizes="192x192" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="<?= base_url()."/public/"; ?>assets/member_css/front-style.css">        
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Comfortaa:wght@300;400;500;600;700&family=DM+Sans:wght@400;500;700&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.4/jquery.min.js"></script> 
+    <script src="<?= base_url()."/public"; ?>/assets/member_js/ajax.js"></script>  
+</head>
+<body class="forgetpassword">
+<?php include 'member_layout/header.php' ?>
+<section class="pt-5 pb-5">
+    <div class="container">
+        <div class="recovery-account">
+            <h1>Account Recovery</h1>
+            <form  method="post" action="<?php echo base_url();?>change_password_form" method="post">
+            <input type="hidden" id="verify_otp" name="verify_otp" value="<?= session()->getTempdata('otp'); ?>">
+            <input type="hidden" id="user" value="<?= session()->getTempdata('user'); ?>">
+               
+            <div id="alert1"></div>
+            <?php if(session()->getTempdata('error')):?>
+               <div class="alert alert-danger" id="alert">
+               <?= session()->getTempdata('error'); ?>
+               </div>
+            <?php endif;?>
+                                
+                <div class="row">
+                    <div class="col-12 mb-3">
+                        <label for="email">Email Address</label>
+                        <input type="email" id="email" name="email" value="<?= session()->getTempdata('email'); ?>" class="form-control" readonly>
+                    </div>
+                    <div class="col-12 mb-4 disable" id="disable">
+                        <label for="email">OTP</label>
+                        <input type="text" id="otp" name="otp" class="form-control" placeholder="OTP" required>
+                    </div>    
+                </div> 
+                <div class="form-group mb-0 text-center" id="re-sub">
+                    <button type=""  id="submit" class="forget-submit">Submit</button> 
+                </div>   
+            </form>
+        </div>    
+    </div>    
+</section>    
+<?php include 'member_layout/footer.php' ?>
+</body>
+</html>
\ No newline at end of file