diff --git a/app/src/main/java/com/example/chan24/smartplanner/DatabaseHelper.java b/app/src/main/java/com/example/chan24/smartplanner/DatabaseHelper.java
index 87f6d372cf282879300baead75a2243b31124ee5..4e50b513f5a8e8bb2b6f59ba4ea253439a159cd0 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/DatabaseHelper.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/DatabaseHelper.java
@@ -2,6 +2,7 @@ package com.example.chan24.smartplanner;
 
 import android.content.ContentValues;
 import android.content.Context;
+import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
@@ -49,5 +50,12 @@ public class DatabaseHelper extends SQLiteOpenHelper {
             return true;
 
     }
+    Cursor retriving()
+    {
+        SQLiteDatabase db =this.getWritableDatabase();
+        Cursor c =db.rawQuery("select * from "+tablename,null);
+        return c;
+
+    }
 
 }
diff --git a/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java b/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
index 951720779d5f829dee7feedf1d532aee13a906e6..bd8d6235134cfa1732ce7590083234cad63d1162 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
@@ -2,6 +2,8 @@
 package com.example.chan24.smartplanner;
 
 import android.content.Intent;
+import android.database.Cursor;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
@@ -9,11 +11,11 @@ import android.widget.Button;
 
 import android.widget.EditText;
 import android.widget.TextView;
-
+import android.widget.Toast;
 
 
 public class LoginActivity extends AppCompatActivity {
-
+    DatabaseHelper db =new DatabaseHelper(this);
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -30,12 +32,36 @@ public class LoginActivity extends AppCompatActivity {
 
             }
         });
-        Button b =(Button)findViewById(R.id.button2);
+        Button b =(Button)findViewById(R.id.login);
         b.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent i =new Intent(getApplicationContext(),UserArea.class);
-                startActivity(i);
+
+                    //StringBuffer str =new StringBuffer();
+                int flag=1;
+                String n=name.getText().toString();
+                String p =password.getText().toString();
+                    Cursor res=db.retriving();
+                    while(res.moveToNext())
+                    {
+                        if(n.equals(res.getString(0)))
+                        {
+                            if(p.equals(res.getString(1)))
+                            {
+                                flag =0;
+                                Intent i =new Intent(getApplicationContext(),UserArea.class);
+                                startActivity(i);
+                            }
+                        }
+
+                    }
+                    if(flag==1)
+                    {
+                        Toast.makeText(getApplicationContext(),"Enter proper details",Toast.LENGTH_SHORT).show();
+                    }
+
+
+
             }
         });
     }
diff --git a/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java b/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java
index 783c255b2337b07c0b548d8f4ccd5063dad0f0ec..c7dbb11ee01e43324124478306da2ad625c306ea 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java
@@ -1,5 +1,8 @@
 package com.example.chan24.smartplanner;
 
+import android.content.Intent;
+import android.database.Cursor;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
@@ -27,7 +30,13 @@ public class RegisterActivity extends AppCompatActivity {
         EditText mail = (EditText)findViewById(R.id.mail);
 
         boolean res =db.insertdata(user.getText().toString(),pass.getText().toString(),mail.getText().toString());
-        if(res)
+        if(res) {
             Toast.makeText(this, "Inserted ", Toast.LENGTH_SHORT).show();
+            Intent i =new Intent(getApplicationContext(),LoginActivity.class);
+            startActivity(i);
+        }
+
+
     }
+
 }
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 11581001ebe9e7e0eee508f3442b21611201a748..864b7b162ca6ce356644040b7cd14ff603aebd6d 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -51,13 +51,4 @@
         android:id="@+id/reg"
         android:textStyle="normal|bold" />
 
-    <Button
-        android:text="Button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/reg"
-        android:layout_alignEnd="@+id/login"
-        android:layout_marginTop="50dp"
-        android:id="@+id/button2" />
-
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_user_area.xml b/app/src/main/res/layout/activity_user_area.xml
index 436c92b65d4a523a705c2b17bd99aa838326aebe..28d1259e36d1b3cff71eb10dfa3bd4576d97bdc6 100644
--- a/app/src/main/res/layout/activity_user_area.xml
+++ b/app/src/main/res/layout/activity_user_area.xml
@@ -13,16 +13,6 @@
     android:orientation="vertical">
 
 
-    <Button
-        android:text="Button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="120dp"
-        android:layout_marginTop="32dp"
-        android:id="@+id/button3" />
-
 </LinearLayout>
 
     <android.support.design.widget.NavigationView