diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
index e2dc07c..89ff1ce 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
@@ -247,7 +247,7 @@ public class LoginActivity extends AppCompatActivity {
         View focusView = null;
 
         // Check for a valid password, if the user entered one.
-        if (!TextUtils.isEmpty(password) && !isPasswordValid(password)) {
+        if (TextUtils.isEmpty(password)) {
             mPasswordView.setError(getString(R.string.error_invalid_password));
             focusView = mPasswordView;
             cancel = true;
@@ -268,12 +268,14 @@ public class LoginActivity extends AppCompatActivity {
             // There was an error; don't attempt login and focus the first
             // form field with an error.
             focusView.requestFocus();
-        } else {
+        } else if(isuseridValid(userid)){
+            Snackbar.make(museridView,getString(R.string.error_incorrect_username),Snackbar.LENGTH_SHORT).show();
+        }else if(isPasswordValid(password)){
+            Snackbar.make(museridView,getString(R.string.error_incorrect_password),Snackbar.LENGTH_SHORT).show();
+        }else{
+
             // Show a progress spinner, and kick off a background task to
             // perform the user login attempt.
-            //showProgress(true);
-           /* mAuthTask = new UserLoginTask(userid, password);
-            mAuthTask.execute((Void) null);*/
 
             new AuthenticateTask().execute();
 
@@ -282,12 +284,29 @@ public class LoginActivity extends AppCompatActivity {
 
     private boolean isuseridValid(String userid) {
         //TODO: Replace this with your own logic
-        return userid.contains("@");
+
+        boolean flag =true;
+
+        String u_id = preferences.getString(CommonString.KEY_USERNAME, "");
+
+        if(!u_id.equals("") && !userid.equals(u_id)){
+            flag = false;
+        }
+
+        return flag;
     }
 
     private boolean isPasswordValid(String password) {
         //TODO: Replace this with your own logic
-        return password.length() > 4;
+        boolean flag =true;
+
+        String pw = preferences.getString(CommonString.KEY_PASSWORD, "");
+
+        if(!password.equals(pw)){
+            flag = false;
+        }
+
+        return flag;
     }
 
     /**
diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml
index a5adafc..2ce5a2d 100644
--- a/GSKMTOrange/src/main/res/values-tr/string.xml
+++ b/GSKMTOrange/src/main/res/values-tr/string.xml
@@ -190,6 +190,7 @@
     <!--Gagan end new code 2-->
 
     <string name="previous_data_upload">Lütfen Önceki Verileri Paylaşın</string>
+    <string name="error_incorrect_username">Bu kullanıcı adı yanlış</string>
 
 </resources>
 
diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml
index cc3d7ae..d6e1a12 100644
--- a/GSKMTOrange/src/main/res/values/strings.xml
+++ b/GSKMTOrange/src/main/res/values/strings.xml
@@ -228,5 +228,6 @@
     <string name="uploadeddata">Uploaded Data</string>
 
     <string name="previous_data_upload">Please Upload Previous Data First</string>
+    <string name="error_incorrect_username">This username is incorrect</string>
 
 </resources>