diff --git a/app/src/main/java/com/mapps/seproject/UserActivity.java b/app/src/main/java/com/mapps/seproject/UserActivity.java
index 96a61b1a934e3aecf8997ce18ade1fc0f73a45bf..2cc718255a11ce0f05151fbc8899f91441fcdb93 100644
--- a/app/src/main/java/com/mapps/seproject/UserActivity.java
+++ b/app/src/main/java/com/mapps/seproject/UserActivity.java
@@ -1,13 +1,66 @@
 package com.mapps.seproject;
 
+import android.content.Intent;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
 
-public class UserActivity extends AppCompatActivity {
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
+
+public class UserActivity extends AppCompatActivity implements View.OnClickListener {
+
+    FirebaseAuth firebaseAuth;
+    Button button;
+    TextView welcome;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_user);
+
+        welcome = (TextView) findViewById(R.id.tvWelcome);
+        button = (Button) findViewById(R.id.bSignOut);
+        firebaseAuth = FirebaseAuth.getInstance();
+
+
+        if(firebaseAuth.getCurrentUser() == null)   {                               // Incase the user hasnt logged in
+
+            finish();
+            startActivity(new Intent(getApplicationContext(),LoginActivity.class));         // Go back to login activity
+
+        }
+
+        FirebaseUser user = firebaseAuth.getCurrentUser();                                  // Get user
+        welcome.setText("Welcome "+user.getEmail());                                        // Get Email
+
+
+        button.setOnClickListener(this);                                                    // Start listener on Button
+
+
+
+
+
+
+
+    }
+
+    @Override
+    public void onClick(View v) {
+
+        if(v == button) {
+
+            firebaseAuth.signOut();                                                         // sign out
+            finish();
+            startActivity(new Intent(this,LoginActivity.class));                        // Go back to login activity
+
+        }
+
+
+
+
+
     }
 }
diff --git a/app/src/main/res/layout/activity_user.xml b/app/src/main/res/layout/activity_user.xml
index 2bddd316e029dced2a159df0db38d48744321761..59ddcc095725186d20165ca455d69303ca08bca3 100644
--- a/app/src/main/res/layout/activity_user.xml
+++ b/app/src/main/res/layout/activity_user.xml
@@ -10,4 +10,21 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context="com.mapps.seproject.UserActivity">
 
+    <Button
+        android:text="Sign Out"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="98dp"
+        android:id="@+id/bSignOut" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="102dp"
+        android:id="@+id/tvWelcome"
+        android:textSize="24sp" />
 </RelativeLayout>