diff --git a/Apollo/api/application/models/Login_model.php b/Apollo/api/application/models/Login_model.php
index 7d14d55e..4f15c377 100755
--- a/Apollo/api/application/models/Login_model.php
+++ b/Apollo/api/application/models/Login_model.php
@@ -177,6 +177,8 @@ class Login_model extends CI_Model
                 else 
                 {
                     $result['loginStatus'] = false;
+                     $result['loginemployee'] = false;
+                     $result['checkemp'] = false;
                     $result['message']     = "Please Enter The Correct OTP.";
                 }
             }
@@ -184,6 +186,8 @@ class Login_model extends CI_Model
             else
             {
                     $result['loginStatus'] = false;
+                     $result['loginemployee'] = false;
+                     $result['checkemp'] = false;
                     $result['message']     = "Please Enter The Correct OTP.";
             } 
 
@@ -193,6 +197,8 @@ class Login_model extends CI_Model
         else 
        {   // echo 'no _else';die();    
                 $result['loginStatus'] = false;
+                $result['loginemployee'] = false;
+                $result['checkemp'] = false;
                 $result['message']     = "Please Enter Register Mobile Number !!";
         }
 
@@ -449,7 +455,7 @@ class Login_model extends CI_Model
                  $result['checkemp'] = false;
                   $result['loginemployee'] = false;
                          
-                $result['message']     = "Your login is de-activated.";
+                $result['message']     = "Please Enter Correct OTP.";
             }
           }
 
@@ -457,7 +463,7 @@ class Login_model extends CI_Model
                 $result['loginStatus'] = false;
                 $result['loginemployee'] = false;
                 $result['checkemp'] = false;
-                $result['message']     = "Your login is de-activated.";
+                $result['message']     = "Your login is de-activated or don't have login.";
             }
 
 
diff --git a/Apollo/assets/js/controllers/loginCtrl.js b/Apollo/assets/js/controllers/loginCtrl.js
index 4cb16f18..f0c367af 100755
--- a/Apollo/assets/js/controllers/loginCtrl.js
+++ b/Apollo/assets/js/controllers/loginCtrl.js
@@ -100,6 +100,11 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
                        
                         swal("Warning!", response.data.message, "warning");
                         }
+
+                        if(response.data.checkemp == false)
+                        {
+                             swal("Warning!", response.data.message, "warning");
+                        }
                         $scope.show = true;
                         $(".alert").delay(200).addClass("in").fadeOut(3500);
                     }
@@ -212,7 +217,7 @@ app.controller('loginCtrl', ["$scope", "$http", "API_POINTS", "$state", '$rootSc
              
             swal("Warning!", response.data.message, "warning");
            //      $scope.show = true;
-           // $(".alert").delay(200).addClass("in").fadeOut(3500);
+            //$(".alert").delay(200).addClass("in").fadeOut(3500);
 
                 //alert(response.data.message);
         }