diff --git a/app/src/main/java/com/example/bondoman/LoginActivity.kt b/app/src/main/java/com/example/bondoman/LoginActivity.kt
index 0b07382716725d6866e1f53f5b133343e9b2a0f6..3d1ac63ac0df379fc9521c057223fba276b77d3b 100644
--- a/app/src/main/java/com/example/bondoman/LoginActivity.kt
+++ b/app/src/main/java/com/example/bondoman/LoginActivity.kt
@@ -32,6 +32,7 @@ class LoginActivity : AppCompatActivity() {
     private fun replaceFragment(fragment: Fragment){
         val fragmentManager = supportFragmentManager
         val fragmentTransaction = fragmentManager.beginTransaction()
+        fragmentTransaction.setCustomAnimations(android.R.anim.fade_in, android.R.anim.fade_out)
         fragmentTransaction.replace(R.id.login_layout,fragment)
         fragmentTransaction.commit()
     }
diff --git a/app/src/main/java/com/example/bondoman/MainActivity.kt b/app/src/main/java/com/example/bondoman/MainActivity.kt
index 5acc399d1ebfdcdc71a57e3a4a052eb8a4f59a83..3fdd64c4b967ea76060c2d26dce2f1542c77ac3e 100644
--- a/app/src/main/java/com/example/bondoman/MainActivity.kt
+++ b/app/src/main/java/com/example/bondoman/MainActivity.kt
@@ -132,12 +132,14 @@ class MainActivity : AppCompatActivity() {
                 try {
                     val response = service.checkToken()
                     if (response.isSuccessful) {
-                       println(response)
+                       println("token still valid")
                     } else {
+                        clearToken()
                         withContext(Dispatchers.Main) {
                             Toast.makeText(context, "Your Session Has Expired", Toast.LENGTH_LONG).show()
                         }
-                        startActivity(Intent(this@MainActivity, LoginActivity::class.java))
+
+                        startActivity(Intent(context, LoginActivity::class.java))
                         finish()
                     }
                 } catch (e: HttpException) {
@@ -148,6 +150,13 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
+
+    private fun clearToken() {
+        val sharedPreferences = getSharedPreferences("BondoMan", Context.MODE_PRIVATE)
+        val editor = sharedPreferences.edit()
+        editor.clear().apply()
+    }
+
     private fun isNetworkConnected(context: Context): Boolean {
         val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
         val network = connectivityManager.activeNetwork ?: return false
diff --git a/app/src/main/java/com/example/bondoman/services/RetrofitInstance.kt b/app/src/main/java/com/example/bondoman/services/RetrofitInstance.kt
index f7abcc7a544270da5c3eca0f5dfd5f0b373c12a9..48f1e06e0e686f387050f99f6f8ea17b16077496 100644
--- a/app/src/main/java/com/example/bondoman/services/RetrofitInstance.kt
+++ b/app/src/main/java/com/example/bondoman/services/RetrofitInstance.kt
@@ -24,7 +24,6 @@ object RetrofitClient {
                 val originalRequest: Request = chain.request()
                 val requestBuilder: Request.Builder = originalRequest.newBuilder()
                 if (!authToken.isNullOrEmpty()) {
-                    println(authToken)
                     requestBuilder.header("Authorization", "Bearer $authToken") // Add authorization header here
                 }
                 val request: Request = requestBuilder.build()
diff --git a/app/src/main/java/com/example/bondoman/ui/login/LoginFragment.kt b/app/src/main/java/com/example/bondoman/ui/login/LoginFragment.kt
index 994ad274eb43ca1585a934632ba0251e5567be4a..bd759b9ee8d60eb2c6c7fea2d5e8b67fdf6b199e 100644
--- a/app/src/main/java/com/example/bondoman/ui/login/LoginFragment.kt
+++ b/app/src/main/java/com/example/bondoman/ui/login/LoginFragment.kt
@@ -17,6 +17,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.withContext
 import retrofit2.HttpException
 import android.content.Context
+import android.content.SharedPreferences
 import android.net.ConnectivityManager
 import android.net.NetworkCapabilities
 import android.widget.Toast
@@ -88,6 +89,7 @@ class LoginFragment : Fragment() {
                                 )
                                 val editor = sharedPreferences.edit()
                                 editor.putString("token", token)
+                                editor.putString("email", email)
                                 editor.apply()
                                 startActivity(Intent(activity, MainActivity::class.java))
                                 activity?.finish()