diff --git a/app/Controllers/Admin_controller.php b/app/Controllers/Admin_controller.php
index 8b5af2a..1812de1 100644
--- a/app/Controllers/Admin_controller.php
+++ b/app/Controllers/Admin_controller.php
@@ -108,7 +108,7 @@ class Admin_controller extends BaseController
 			{
 				if($userdata['is_active'] == 0)
 				{
-					$this->session->setTempdata('error','User id or password is invalid',3);
+					$this->session->setTempdata('error','Your account is deactivated',3);
 					$this->session->setTempdata('A_email',$this->request->getVar('email'),3);
 					$this->session->setTempdata('A_password',$this->request->getVar('password'),3);
 					return redirect()->to(base_url()."admin");	
@@ -120,7 +120,7 @@ class Admin_controller extends BaseController
 
 					
 
-					$this->session->set('logged_user',$userdata['id']);
+					$this->session->set('logged_admin_user',$userdata['id']);
 
 					return redirect()->to(base_url().'admin_home');
 
@@ -128,7 +128,7 @@ class Admin_controller extends BaseController
 
 				else{
 
-					$this->session->setTempdata('error','User id or password is invalid',3);
+					$this->session->setTempdata('error','sorry wrong password entered for the Email',3);
 					$this->session->setTempdata('A_email',$this->request->getVar('email'),3);
 					$this->session->setTempdata('A_password',$this->request->getVar('password'),3);
 					return redirect()->to(base_url()."admin");
@@ -139,7 +139,7 @@ class Admin_controller extends BaseController
 
 			{
 
-			  $this->session->setTempdata('error','User id or password is invalid',3);
+			  $this->session->setTempdata('error','sorry Email does not exist',3);
 			  $this->session->setTempdata('A_email',$this->request->getVar('email'),3);
 			  $this->session->setTempdata('A_password',$this->request->getVar('password'),3);
 			  return redirect()->to(base_url()."admin");				  
@@ -166,10 +166,11 @@ class Admin_controller extends BaseController
 
 	{
 
-		session()->remove('logged_user');
-
-		session()->destroy();
-
+		session()->remove('logged_admin_user');
+        if(!session()->get('logged_user'))
+		{
+			session()->destroy();
+		}
 		return redirect()->to(base_url()."admin");
 
 	}
@@ -182,9 +183,9 @@ class Admin_controller extends BaseController
 
 		
 
-		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
+		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
-		$data['userList'] =  $this->UserModel->where('users.id != ',session()->get('logged_user') )->findAll();
+		$data['userList'] =  $this->UserModel->where('users.id != ',session()->get('logged_admin_user') )->findAll();
 
 		echo view('layout/header',$userdata);
 
@@ -207,27 +208,13 @@ class Admin_controller extends BaseController
 		if($this->request->getmethod() == 'post')
 
 		{
-			$UserData = $this->request->getVar();
 
-			$user_id =  $this->request->getVar('id');
-
-			$check_if_mailid_is_diff = $this->UserModel->where('id', $user_id )->find();
-			if($check_if_mailid_is_diff[0]['email'] != $this->request->getVar('email'))
-			{
-
-				$this->UserModel->where('id', $user_id )->set(array( 'new_mail' => $this->request->getVar('email') ))->update();
-
-				$sendmail_controller = new Sendmail_controller();
-
-				$get_data = $sendmail_controller->index($check_if_mailid_is_diff[0]['email'] , $this->request->getVar('email') , 6 );
-
-				return redirect()->to(base_url()."users_list");
-				
-			}
-			else
-			{
 				//update member details
 
+				$UserData = $this->request->getVar();
+
+				$user_id =  $this->request->getVar('id');
+
 				$this->UserModel->where('id', $user_id )->set($UserData)->update();
 
 				if ($this->request->getVar('profile_check') == 'profile_edit') {
@@ -237,8 +224,6 @@ class Admin_controller extends BaseController
 				}
 
 				return redirect()->to(base_url()."users_list");
-			}
-
 
 			
 
@@ -246,7 +231,7 @@ class Admin_controller extends BaseController
 
 		
 
-		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
+		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 		$zip = $this->ZipcodeModel->findAll();
 
@@ -345,7 +330,7 @@ class Admin_controller extends BaseController
 
 
 
-		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
+		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 		$zip = $this->ZipcodeModel->findAll();
 
@@ -411,7 +396,7 @@ class Admin_controller extends BaseController
 
 	{
 
-		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
+		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 		
 
@@ -513,7 +498,7 @@ class Admin_controller extends BaseController
 
 		
 
-		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
+		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 		$data['PackageData'] =  $this->PackagesModel->findAll();
 
@@ -559,7 +544,7 @@ class Admin_controller extends BaseController
 
 		
 
-		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
+		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 		
 
@@ -605,7 +590,7 @@ class Admin_controller extends BaseController
 
 		
 
-		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
+		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 		echo view('layout/header',$userdata);
 
@@ -683,7 +668,7 @@ class Admin_controller extends BaseController
 
 		
 
-		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
+		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 		echo view('layout/header',$userdata);
 
@@ -703,7 +688,7 @@ class Admin_controller extends BaseController
 	{
 		if($member_id == null)
 		{
-			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user'));
+			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 			
 			$data['creditsData'] =   $this->TransactionModel->select('transactions.* , member.name as member_name ')
 													   ->join('member', 'transactions.member_id = member.id', 'left')
@@ -716,7 +701,7 @@ class Admin_controller extends BaseController
 		
 		}else{
 		
-			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user'));
+			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 			
 			$creditsData =   $this->TransactionModel->select('transactions.* , member.name as member_name ')
 												->join('member', 'transactions.member_id = member.id', 'left')
@@ -832,7 +817,7 @@ class Admin_controller extends BaseController
 
 			$userdata['template_data'] = $this->MailModel->findAll();
 
-			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user'));
+			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 			echo view('layout/header',$userdata);
 
@@ -916,7 +901,7 @@ class Admin_controller extends BaseController
 
 					$data['to'] = $temp_data[0]['to'];
 
-					$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user'));
+					$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 					echo view('layout/header',$userdata);
 
@@ -990,7 +975,7 @@ class Admin_controller extends BaseController
 
 		{			
 
-			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user'));
+			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 			$ruledata['rule_data'] = $this->RuleModel->findAll();
 
@@ -1036,7 +1021,7 @@ class Admin_controller extends BaseController
 
 		{			
 
-			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user'));
+			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 			// $ruledata['rule_data'] = $this->RuleModel->findAll();
 
@@ -1068,7 +1053,7 @@ class Admin_controller extends BaseController
 
 		{			
 
-			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_user'));
+			$userdata['userdata'] = $this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 			// $ruledata['rule_data'] = $this->RuleModel->findAll();
 
diff --git a/app/Controllers/Dashboard.php b/app/Controllers/Dashboard.php
index bd9737c..89a5a4a 100644
--- a/app/Controllers/Dashboard.php
+++ b/app/Controllers/Dashboard.php
@@ -33,12 +33,12 @@ class Dashboard extends BaseController
 	{
 		
 		$data = [];
-		if(!session()->has('logged_user'))
+		if(!session()->has('logged_admin_user'))
 		{
 			return redirect()->to(base_url());
 		}
 		
-		$id = session()->get('logged_user');
+		$id = session()->get('logged_admin_user');
 		$data['userdata']=$this->dModel->getLoggedInUserData($id);
 		$data['MembersCount'] =  $this->MemberModel->selectCount('id')->get()->getRow()->id;
 		$data['AdminCount'] =  $this->UserModel->selectCount('id')->where('role','Admin')->get()->getRow()->id;
diff --git a/app/Controllers/Member_controller.php b/app/Controllers/Member_controller.php
index 849e958..90652e7 100644
--- a/app/Controllers/Member_controller.php
+++ b/app/Controllers/Member_controller.php
@@ -263,7 +263,10 @@ class Member_controller extends BaseController
 
 		session()->remove('logged_user');
 
-		session()->destroy();
+		if(!session()->get('logged_admin_user'))
+		{
+			session()->destroy();
+		}
 
 		return redirect()->to(base_url());
 
@@ -334,31 +337,12 @@ class Member_controller extends BaseController
 	public function members_list()
 
 	{
-
-
-
-		
-
-		
-
-
-
-		$id = session()->get('logged_user');
-
+		$id = session()->get('logged_admin_user');
 		$userdata['userdata']=$this->dModel->getLoggedInUserData($id);
-
 		$data['Membersdata'] =  $this->MemberModel->findAll();
 
-												
-
-												
-
-												  
-
 		echo view('layout/header',$userdata);
-
 		echo view('members_list',$data);
-
 		echo view('layout/footer');
 
 	}
@@ -366,33 +350,18 @@ class Member_controller extends BaseController
 
 
 	public function member_deactivate($id = null)
-
 	{
-
-				
-
 		$this->MemberModel->where('md5(id)', $id )->set(array( 'is_active' => 0))->update();
-
 		return redirect()->to(base_url()."members_list");
 
-			
-
 	}	
 
 
 
 	public function member_activate($id = null)
-
 	{
-
-				
-
 		$this->MemberModel->where('md5(id)', $id )->set(array( 'is_active' => 1))->update();
-
 		return redirect()->to(base_url()."members_list");
-
-			
-
 	}
 
 
@@ -427,7 +396,7 @@ class Member_controller extends BaseController
 
 
 
-		$logged_user_id = session()->get('logged_user');
+		$logged_user_id = session()->get('logged_admin_user');
 
 		$userdata['userdata']=$this->dModel->getLoggedInUserData($logged_user_id);
 
@@ -509,7 +478,7 @@ class Member_controller extends BaseController
 
 		
 
-		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_user'));
+		$userdata['userdata']=$this->dModel->getLoggedInUserData(session()->get('logged_admin_user'));
 
 		$zip = $this->ZipcodeModel->findAll();