diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index c2c975b..ced0ae9 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -85,13 +85,9 @@ class Member_controller extends BaseController
 				// Generate a random verification code
 				$verification_code = rand(10 , 99 ).rand(10 , 99 ).rand(10 , 99 );
 				$MemberData['verification_code'] = $verification_code;
-				// print_r($MemberData);die();
 				$insert_data = $this->MemberModel->save($MemberData);
 				if($insert_data)
 				{
-					// Send the verification email
-					// return redirect()->to(base_url()."mail/".$this->request->getVar('email')."/".$verification_code);
-					// Send the verification email
 					$sendmail_controller = new Sendmail_controller();
 					$sendmail_controller->index($this->request->getVar('email') , $MemberData['verification_code'] , 1); 
 					return redirect()->to(base_url());
diff --git a/app/Controllers/Sendmail_controller.php b/app/Controllers/Sendmail_controller.php
index 70c4c05..44f00be 100644
--- a/app/Controllers/Sendmail_controller.php
+++ b/app/Controllers/Sendmail_controller.php
@@ -46,6 +46,10 @@ class Sendmail_controller extends BaseController
                 $data['html'] = str_replace("%name%",$mem_data[0]['name'],$temp_data[0]['html']);
                 }
                 $message = view('verification_mail_temp',$data);
+                if ($temp_data[0]['is_active'] == 1)
+                $email->setSubject($temp_data[0]['subject']);
+                else
+                $email->setSubject('Password change');
             } 
             else 
             {
@@ -59,6 +63,10 @@ class Sendmail_controller extends BaseController
                 $message = view('verification_mail_temp',$data);
             }
             $message = view('verification_mail_temp',$data);
+            if ($temp_data[0]['is_active'] == 1)
+            $email->setSubject($temp_data[0]['subject']);
+            else
+            $email->setSubject('Password change');
         }
         // user => type 2   
         else if($return == 3)
@@ -74,6 +82,10 @@ class Sendmail_controller extends BaseController
             if ($temp_data) 
             $data['html'] = str_replace("%name%",$user_data[0]['name'],$temp_data[0]['html']);
             $message = view('verification_mail_temp',$data);
+            if ($temp_data[0]['is_active'] == 1)
+            $email->setSubject($temp_data[0]['subject']);
+            else
+            $email->setSubject('Username Password');
         }
         // otp  => type 3         
         else if ($return == 2)
@@ -91,6 +103,10 @@ class Sendmail_controller extends BaseController
                 $data['html'] = str_replace("%otp%",$code,$html);
                 }
                 $message = view('verification_mail_temp',$data);
+                if ($temp_data[0]['is_active'] == 1)
+                $email->setSubject($temp_data[0]['subject']);
+                else
+                $email->setSubject('OTP verification');
             } 
             else 
             {
@@ -103,8 +119,11 @@ class Sendmail_controller extends BaseController
                 $data['html'] = str_replace("%otp%",$code,$html);
                 }
                 $message = view('verification_mail_temp',$data);
+                if ($temp_data[0]['is_active'] == 1)
+                $email->setSubject($temp_data[0]['subject']);
+                else
+                $email->setSubject('OTP verification');
             }
-            $message = view('verification_mail_temp',$data);
         }
         // member => type 1    
         else if($return == 1)
@@ -121,9 +140,11 @@ class Sendmail_controller extends BaseController
             if ($temp_data) 
             $data['html'] = str_replace("%name%",$user_data[0]['name'],$temp_data[0]['html']);
             $message = view('verification_mail_temp',$data);
-            
+            if ($temp_data[0]['is_active'] == 1)
+            $email->setSubject($temp_data[0]['subject']);
+            else
+            $email->setSubject('Verify your email address');
         }
-        $email->setSubject('Verify your email address');
         $email->setMessage($message);
         if ($email->send()) 
         {
@@ -162,10 +183,12 @@ class Sendmail_controller extends BaseController
                     // Show error message
                     echo 'Error in verifying email. Please try again.';
                 }
-            }else{
+            }
+            else
+            {
              // Show error message
              echo 'Email already verified.';
-             }
+            }
         }
         else
         {
diff --git a/app/Views/layout/footer.php b/app/Views/layout/footer.php
index 0deaaf6..adbccb1 100644
--- a/app/Views/layout/footer.php
+++ b/app/Views/layout/footer.php
@@ -94,9 +94,6 @@
         
         <script src="<?= base_url()."/public"; ?>/assets/js/pages/email.init.js"></script>
 
-        <!-- App js -->
-        <script src="<?= base_url()."/public"; ?>/assets/js/app.min.js"></script>
-
 
 
     </body>