diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue
index 909b682..b894b61 100644
--- a/src/pages/Dashboard.vue
+++ b/src/pages/Dashboard.vue
@@ -71,17 +71,17 @@
           <v-spacer></v-spacer>
         </v-toolbar>
         <v-card>
-          <v-flex align-center justify-center layout text-xs-center>
+          <!-- <v-flex align-center justify-center layout text-xs-center>
             <v-avatar size="50px" style="position:absolute; top:10px; ">
               <img src="/static/icon/user.png">
             </v-avatar>
-          </v-flex>
+          </v-flex> -->
           <v-card-text>
             <v-container>
               <v-layout wrap justify-center>
                 <v-flex xs12 sm9>
                   <v-form ref="form" v-model="valid" lazy-validation>
-                    <v-layout style="position:relative; top:15px;">
+                    <v-layout style="position:relative;">
                       <v-flex xs4 class="pt-4 subheading">
                         <label>Full Name:</label>
                       </v-flex>
diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index 97c2051..926adc6 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -99,7 +99,7 @@ export default {
         //   (/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})/.test(
         //     v
         //   ) &&
-        //     v.length >= 4) ||
+        //     v.length >= 6) ||
         //   "Min 4 characters upper case lower case symbol required"
       }
     };
diff --git a/src/pages/Students.vue b/src/pages/Students.vue
index db78d35..96fae4f 100644
--- a/src/pages/Students.vue
+++ b/src/pages/Students.vue
@@ -71,17 +71,17 @@
           <v-spacer></v-spacer>
         </v-toolbar>
         <v-card>
-          <v-flex align-center justify-center layout text-xs-center>
+         <!--  <v-flex align-center justify-center layout text-xs-center>
             <v-avatar size="50px" style="position:absolute; top:10px; ">
               <img src="/static/icon/user.png">
             </v-avatar>
-          </v-flex>
+          </v-flex> -->
           <v-card-text>
             <v-container>
               <v-layout wrap justify-center>
                 <v-flex xs12 sm9>
                   <v-form ref="form" v-model="valid" lazy-validation>
-                    <v-layout style="position:relative; top:15px;">
+                    <v-layout style="position:relative;">
                       <v-flex xs4 class="pt-4 subheading">
                         <label>Full Name:</label>
                       </v-flex>
diff --git a/src/pages/forgetpassword.vue b/src/pages/forgetpassword.vue
index a436ac6..ab659de 100644
--- a/src/pages/forgetpassword.vue
+++ b/src/pages/forgetpassword.vue
@@ -2,68 +2,158 @@
   <v-app id="login">
     <v-toolbar color="grey lighten">
       <v-toolbar-items>
-       <!-- <img src="/static/ana@2x.png" height="36" alt="ana" /> -->
-       <h3 class="white--text my-3 ml-4">School-Management</h3>
-    </v-toolbar-items>
-  </v-toolbar>
-    <v-content>
-      <v-container fluid fill-height>
-        <v-layout align-center justify-center>
-          <v-flex xs12 sm8 md7 lg5>
-          <v-toolbar color="black" dark>
-          <v-spacer></v-spacer>
-          <v-toolbar-title>Forget Password</v-toolbar-title>
-          <v-spacer></v-spacer>  
-        </v-toolbar>
-            <v-card class="elevation-1 pa-1">
-              <v-card-text>
-                <h5 class="text-xs-center"> Not to Worry! Enter to your registered Email ID. </h5>
-                <h5 class="text-xs-center"> We'll send you a reset.</h5>
-                <v-flex lg4 sm6 xs10 offset-sm3 offset-xs1 offset-lg4>                           
-                <v-form class="mt-4">
-                <div class="custom-input-align">
-                <v-text-field 
-                  class="text-md-center"
-                  v-validate="'required|email'" 
-                  v-model="changePassword" 
-                  :error-messages="errors.collect('email')" 
-                  label="Enter Your email ID" 
-                  data-vv-name="email" 
-                  required>
-                </v-text-field>
-                </div>  
-                </v-form></v-flex>
-                </v-card-text>
-                <v-card-actions>
-                <v-flex text-xs-center>
-                <v-btn round class="mt-1 button" color="black" dark large @click="reset">Send Request</v-btn></v-flex>
-                </v-card-actions>
-                <v-snackbar
-                 :timeout="timeout"
-                 :top="y === 'top'"
-                 :right="x === 'right'"
-                 :vertical="mode === 'vertical'"
-                 v-model="snackbar"
-                 :color= color
-                 >
-                  {{ text }}
-               </v-snackbar>
-              </v-snackbar>
-            </v-card>
-          </v-flex>
-        </v-layout>
-      </v-container>
-    </v-content>
-  <v-footer class="pa-4" color="grey darken-2"> 
+        <!-- <img src="/static/ana@2x.png" height="36" alt="ana" /> -->
+        <h3 class="white--text my-3 ml-4">School-Management</h3>
+      </v-toolbar-items>
+    </v-toolbar>
+    <v-container fluid>
+      <v-layout align-center justify-center fill-height>
+        <v-flex xs12 sm8 md7 lg8>
+          <div>
+            <v-app>
+              <v-stepper v-model="e2">
+                <v-stepper-header>
+                  <v-stepper-step :complete="e2 > 1" step="1">Fill Your Email</v-stepper-step>
+                  <v-divider></v-divider>
+                  <v-stepper-step step="2">Last Step of Forget Password</v-stepper-step>
+                </v-stepper-header>
+                <v-stepper-items>
+                  <v-stepper-content step="1">
+                    <v-content>
+                      <v-container fluid>
+                        <v-layout align-center justify-center fill-height>
+                          <v-flex xs12 sm8 md7 lg10>
+                            <v-toolbar color="black" dark>
+                              <v-spacer></v-spacer>
+                              <v-toolbar-title>Forget Password</v-toolbar-title>
+                              <v-spacer></v-spacer>
+                            </v-toolbar>
+                            <v-card class="elevation-1 pa-1">
+                              <v-card-text>
+                                <h5 class="text-xs-center"> Not to Worry! Enter to your registered Email ID. </h5>
+                                <h5 class="text-xs-center"> We'll send you a reset.</h5>
+                                <v-flex lg4 sm6 xs10 offset-sm3 offset-xs1 offset-lg4>
+                                  <v-form class="mt-4">
+                                    <div class="custom-input-align">
+                                      <v-text-field 
+                                       class="text-md-center"
+                                       :rules="emailRules"
+                                       v-model="forgetemail" 
+                                       label="Enter Your email ID" 
+                                       required></v-text-field>
+                                    </div>
+                                  </v-form>
+                                </v-flex>
+                              </v-card-text>
+                              <v-card-actions>
+                                <v-flex text-xs-center>
+                                  <v-btn round class="mt-1 button" color="black" dark large @click="reset, e2 = 2">Send Request</v-btn>
+                                </v-flex>
+                              </v-card-actions>
+                              <v-snackbar
+                                     :timeout="timeout"
+                                     :top="y === 'top'"
+                                     :right="x === 'right'"
+                                     :vertical="mode === 'vertical'"
+                                     v-model="snackbar"
+                                     :color= color 
+                             >
+                            {{ text }}
+                             </v-snackbar>
+                            </v-snackbar>
+                          </v-card>
+                        </v-flex>
+                      </v-layout>
+                    </v-container>
+                  </v-content>
+                </v-stepper-content>
+                <v-stepper-content step="2">
+                  <v-content>
+                    <v-container fluid fill-height>
+                      <v-layout align-center justify-center>
+                        <v-flex xs12 sm8 md7 lg10>
+                          <v-toolbar color="black" dark>
+                            <v-spacer></v-spacer>
+                            <v-toolbar-title>Forget Password</v-toolbar-title>
+                            <v-spacer></v-spacer>
+                          </v-toolbar>
+                          <v-card class="elevation-1 pa-1">
+                            <v-card-text>
+                              <h5 class="text-xs-center"> Not to Worry! Enter to your registered Email ID And New Password. </h5>
+                              <h5 class="text-xs-center"> We'll send you a reset.</h5>
+                              <v-flex lg4 sm6 xs10 offset-sm3 offset-xs1 offset-lg4>
+                                <v-form class="mt-4">
+                                  <div class="custom-input-align">
+                                    <v-text-field 
+                                     class="text-md-center"
+                                     v-model="email" 
+                                     :rules="emailRules"
+                                     label="Enter Your email ID" 
+                                     required></v-text-field>
+                                    <v-text-field
+                                    :rules="[rules.required,rules.min]"
+                                    v-model="changepassword"
+                                    :append-icon="e1 ? 'visibility_off' : 'visibility'"
+                                    :append-icon-cb="() => (e1 = !e1)"
+                                    :type="e1 ? 'password' : 'text'"
+                                    name="input-10-1"
+                                    label="Password"
+                                    counter
+                                   ></v-text-field>
+                                  </div>
+                                </v-form>
+                              </v-flex>
+                            </v-card-text>
+                            <v-card-actions>
+                              <v-flex text-xs-center>
+                                <v-btn round class="mt-1 button" color="black" dark large @click="resetPassword">Send Request</v-btn>
+                              </v-flex>
+                            </v-card-actions>
+                            <v-snackbar
+                                :timeout="timeout"
+                                :top="y === 'top'"
+                                :right="x === 'right'"
+                                :vertical="mode === 'vertical'"
+                                v-model="snackbar"
+                                :color= color
+                            >
+                            {{ text }}
+                           </v-snackbar>
+                          </v-snackbar>
+                        </v-card>
+                      </v-flex>
+                    </v-layout>
+                  </v-container>
+                </v-content>
+                <v-btn
+            color="black"
+            dark
+            @click="e2 = 1"
+          >
+            Back
+          </v-btn>
+              </v-stepper-content>
+            </v-stepper-items>
+          </v-stepper>
+         </v-app>
+       </div>
+      </v-flex>
+     </v-layout>
+    </v-container>
+   <v-footer class="pa-4" color="grey darken-2">
   </v-footer>
-  </v-app>
+ </v-app>
 </template>
+
+
+
 <script>
 import http from '@/Services/http.js';
 
 export default {
   data: () => ({
-    changePassword:'',
+    e1: true,
+    e2:0,
     snackbar: false,
     y: 'top',
     x: 'right',
@@ -71,18 +161,53 @@ export default {
     timeout: 4000,
     text: '',
     loading: false,
-    email: ''
+    email: '',
+    forgetemail:'',
+    password:'',
+    changepassword:'',
+    emailRules: [
+        v => !!v || "Email is required"
+
+    ],
+    rules: {
+        required: value => !!value || "password is Required.",
+        min: v =>
+          (/^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[!@#$%^&*])(?=.{8,})/.test(
+            v
+          ) &&
+            v.length >= 6) ||
+          "Min 4 characters upper case lower case symbol required"
+      }
   }),
 
   methods: {
     reset () {
-
-      http().get('/schoolForgotPassword?email='+ this.changePassword)
+      http().get('/schoolForgotPassword?email='+ this.forgetemail)
+        .then(response => {
+          // console.log("response=====>",response.data.data.token);
+          this.$store.dispatch("setToken", response.data.data.token);
+          this.loading = true;
+          if(this.snackbar=true){
+              this.text= "Please you Fill Last Step of Forget Password!"              
+          }
+       }).catch(err => {
+           this.text="User Not Found or Incorrect Email"
+           this.snackbar= true;
+           this.loading = false;
+       })
+    },
+    resetPassword(){
+      let forgotPassword = {
+        resetToken: this.$store.state.token,
+        email: this.email,
+        password: this.changepassword
+      }
+      http().post('/schoolResetPassword',forgotPassword)
         .then(response => {
           console.log("response=====>",response);
           this.loading = true;
           if(this.snackbar=true){
-              this.text= "Please check your email and Copy your password!"              
+              this.text= "Successfully Change your Password"              
           }
           setTimeout(() => {
           this.$router.push('/');
@@ -101,8 +226,7 @@ export default {
 }
 
 };
-</script>
-<style scoped lang="css">
+</script>undefined<style scoped lang="css">
   #login {
     height: 50%;
     width: 100%;