diff --git a/Apollo/api/application/models/Login_model.php b/Apollo/api/application/models/Login_model.php
index c6ac459a..f66bb52a 100755
--- a/Apollo/api/application/models/Login_model.php
+++ b/Apollo/api/application/models/Login_model.php
@@ -149,11 +149,13 @@ class Login_model extends CI_Model
           $this->db->where('Password',$password);
           $this->db->where('IsActive','1');
           $details = $this->db->get()->first_row();
-
-         // print_r($details);die();
+         // print_r($this->db->last_query());die();
+         //print_r($details);die();
 
            $time = date('Y-m-d');
            $dateTime = $time;
+            if(!empty($details))
+           {
 
           $password_date = new DateTime($details->Password_Date);
           $today_date = new DateTime($dateTime);
@@ -173,8 +175,8 @@ class Login_model extends CI_Model
 
 
 
-           if(!empty($details))
-           {
+           // if(!empty($details))
+           // {
 
           if($days_between>'+30')
           {
diff --git a/Apollo/assets/js/controllers/loginCtrl.js b/Apollo/assets/js/controllers/loginCtrl.js
index edc057ca..d46ce2a3 100755
--- a/Apollo/assets/js/controllers/loginCtrl.js
+++ b/Apollo/assets/js/controllers/loginCtrl.js
@@ -15,11 +15,18 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
         'passwordemp':''
     };
 
+    $scope.myPwdModel= {
+        curr: "",
+        newpassword: "",
+        empid:""
+    };
+
     $scope.typeInput = 'password';
     $scope.place = 'password';
     $scope.icon = 'fa fa-lock';
     $scope.show = false;
     $scope.info = false;
+    $scope.change_empid='';
 
     $scope.loginbutton = true;
    
@@ -30,7 +37,7 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
 
  $scope.Login=function(myModel)
   {
-        
+        //console.log(myModel);return false;
 
            // alert($scope.Empcheck);
 
@@ -130,9 +137,12 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
                     }
                      else if((response.data.loginStatus == false) &&(response.data.passwordStatus==false))
                      {
-                          console.log('else if')
+                          //console.log('else if')
+                         $scope.change_empid=myModel.userMobile;
+                         $scope.myPwdModel.empid=$scope.change_empid;
+                         $rootScope.Emp = $scope.change_empid;
 
-                          $state.go('login.Login_pwdchange');
+                         $state.go('login.Login_pwdchange');
                      }
 
 
@@ -336,11 +346,19 @@ $scope.EmpLogin=function(myModel)
     }
 
 
- $scope.myPwdModel = {
-        curr: "",
-        newpassword: "",
-        empid:""
-    };
+ // $scope.myPwdModel= {
+ //        curr: "",
+ //        newpassword: "",
+ //        empid:""
+ //    };
+
+
+     $scope.initlogchange = function (){
+
+       //console.log($rootScope.Emp);
+       // console.log($scope.myPwdModel.empid)
+       $scope.myPwdModel.empid=$rootScope.Emp
+     }
 
 
     $scope.ChangePassword = function (Form,myPwdModel) 
diff --git a/Apollo/assets/views/changelogin_password.html b/Apollo/assets/views/changelogin_password.html
index e8acec6b..736f131f 100644
--- a/Apollo/assets/views/changelogin_password.html
+++ b/Apollo/assets/views/changelogin_password.html
@@ -8,7 +8,7 @@
 </section>
 
 
-<div ng-controller="loginCtrl" class="container-fluid container-fullw bg-white">
+<div ng-controller="loginCtrl" class="container-fluid container-fullw bg-white" data-ng-init="initlogchange()">
     <div class="row">
         <div class="col-md-8">
             <div>
@@ -27,7 +27,7 @@
                                             <div class="form-group">
                                                 <label class="control-label">EMP ID <span class="symbol required"></span></label>
 
-                                                <input type="text" placeholder="Enter EMPID" class="form-control" name="empid" ng-model="myPwdModel.empid"
+                                                <input type="text" placeholder="Enter EMPID" class="form-control" name="empid" ng-model="myPwdModel.empid" ng-disabled="true"
                                                     required/>
 
                                             </div>