diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f2d236a..16435b7 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -58,6 +58,8 @@ kotlin {
 
 dependencies {
     implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.livedata)
+    implementation(libs.androidx.lifecycle.viewmodel)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
     implementation(libs.androidx.constraintlayout)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a43457f..27e3837 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
+        android:name=".AceApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
diff --git a/app/src/main/java/com/example/acetimetracker/AceApplication.kt b/app/src/main/java/com/example/acetimetracker/AceApplication.kt
new file mode 100644
index 0000000..2e90933
--- /dev/null
+++ b/app/src/main/java/com/example/acetimetracker/AceApplication.kt
@@ -0,0 +1,9 @@
+package com.example.acetimetracker
+
+import android.app.Application
+import com.example.acetimetracker.account.AccountServices
+import com.example.acetimetracker.account.firebaseAccountServices
+
+open class AceApplication : Application() {
+    open val accounts: AccountServices by lazy { firebaseAccountServices() }
+}
diff --git a/app/src/main/java/com/example/acetimetracker/Categories.kt b/app/src/main/java/com/example/acetimetracker/Categories.kt
index 9f920ae..fbf8bbf 100644
--- a/app/src/main/java/com/example/acetimetracker/Categories.kt
+++ b/app/src/main/java/com/example/acetimetracker/Categories.kt
@@ -6,25 +6,23 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.ImageButton
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
+import com.example.acetimetracker.account.AccountActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FirebaseFirestore
 
-class Categories : AppCompatActivity() {
+class Categories : AccountActivity() {
     private lateinit var recyclerView: RecyclerView
     private lateinit var categoryAdapter: CategoryAdapter
     private lateinit var firestore: FirebaseFirestore
-    private lateinit var auth: FirebaseAuth
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (!sessionReady) return
         setContentView(R.layout.activity_categories)
 
         // Initialize Firebase
         firestore = FirebaseFirestore.getInstance()
-        auth = FirebaseAuth.getInstance()
 
         // Initialize views
         recyclerView = findViewById(R.id.recyclerViewCategories)
@@ -55,13 +53,14 @@ class Categories : AppCompatActivity() {
     }
 
     private fun fetchDataFromFirestore() {
-        val userId = auth.currentUser?.uid
+        val userId = currentSessionUid()
         if (userId != null) {
             firestore.collection("users")
                 .document(userId)
                 .collection("categories")
                 .get()
                 .addOnSuccessListener { result ->
+                    if (currentSessionUid() != userId) return@addOnSuccessListener
                     val categories = mutableListOf<Category>()
                     for (document in result) {
                         val name = document.getString("name") ?: ""
@@ -111,13 +110,14 @@ class Categories : AppCompatActivity() {
                 "timeSpent" to 0L // Consider if you need this field
             )
 
-            val userId = auth.currentUser?.uid
+            val userId = currentSessionUid()
             if (userId != null) {
                 firestore.collection("users")
                     .document(userId)
                     .collection("categories")
                     .add(categoryData)
                     .addOnSuccessListener { documentReference ->
+                        if (currentSessionUid() != userId) return@addOnSuccessListener
                         Log.d("Categories", "Category added with ID: ${documentReference.id}")
                         Toast.makeText(this, "Category added: $categoryName", Toast.LENGTH_SHORT).show()
                         // Clear input fields
@@ -144,7 +144,7 @@ class Categories : AppCompatActivity() {
 
     // Function to delete a category (add this inside the Categories activity)
     private fun deleteCategory(category: Category) {
-        val userId = auth.currentUser?.uid
+        val userId = currentSessionUid()
         if (userId != null) {
 
             firestore.collection("users")
@@ -153,6 +153,7 @@ class Categories : AppCompatActivity() {
                 .document(category.documentId) // Use category.documentId
                 .delete()
                 .addOnSuccessListener {
+                    if (currentSessionUid() != userId) return@addOnSuccessListener
                     Log.d("Categories", "Category deleted with ID: ${category.documentId}")
                     Toast.makeText(this, "Category deleted: ${category.name}", Toast.LENGTH_SHORT).show()
                     fetchDataFromFirestore()
diff --git a/app/src/main/java/com/example/acetimetracker/EditProfileActivity.kt b/app/src/main/java/com/example/acetimetracker/EditProfileActivity.kt
index 42831dc..05942c3 100644
--- a/app/src/main/java/com/example/acetimetracker/EditProfileActivity.kt
+++ b/app/src/main/java/com/example/acetimetracker/EditProfileActivity.kt
@@ -2,183 +2,62 @@ package com.example.acetimetracker
 
 import android.app.Activity
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import android.view.View
-import android.view.WindowManager
 import android.widget.Button
 import android.widget.EditText
 import android.widget.ImageView
-import android.widget.Toast
+import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
-import com.airbnb.lottie.LottieAnimationView
-import com.airbnb.lottie.LottieDrawable
+import androidx.core.widget.doAfterTextChanged
+import androidx.lifecycle.ViewModelProvider
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
-import com.google.firebase.auth.FirebaseAuth
-import com.google.firebase.firestore.FirebaseFirestore
-import com.google.firebase.firestore.SetOptions
-import com.google.firebase.storage.FirebaseStorage
-import java.util.UUID
+import com.example.acetimetracker.account.*
 
-class EditProfileActivity : AppCompatActivity() {
-
-    private lateinit var auth: FirebaseAuth
-    private lateinit var firestore: FirebaseFirestore
-    private lateinit var storage: FirebaseStorage
-    private var selectedImageUri: Uri? = null
-    private lateinit var profilePictureUrl: String
-    private lateinit var profileImageView: ImageView
-    private lateinit var profilePictureLoadingAnimation: LottieAnimationView
-
-    // Use an ActivityResultLauncher for the image picker
-    private val startForResult = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-        if (result.resultCode == Activity.RESULT_OK) {
-            selectedImageUri = result.data?.data
-            if (selectedImageUri != null) {
-                uploadImageToFirebaseStorage(selectedImageUri)
-            }
-        }
+class EditProfileActivity : AccountActivity() {
+    private val model by lazy { ViewModelProvider(this, AccountViewModelFactory(accounts))[ProfileViewModel::class.java] }
+    private var displayedPhoto: String? = null
+    private val picker = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+        if (result.resultCode == Activity.RESULT_OK && currentSessionUid() != null) result.data?.data?.let(model::upload)
     }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (!sessionReady) return
         setContentView(R.layout.activity_edit_profile)
-
-        auth = FirebaseAuth.getInstance()
-        firestore = FirebaseFirestore.getInstance()
-        storage = FirebaseStorage.getInstance()
-
-        val editDisplayNameEditText = findViewById<EditText>(R.id.editDisplayNameEditText)
-        val editEmailEditText = findViewById<EditText>(R.id.editEmailEditText)
-        val uploadProfilePictureButton = findViewById<Button>(R.id.uploadProfilePictureButton)
-        val saveProfileChangesButton = findViewById<Button>(R.id.saveProfileChangesButton)
-
-        // Initialize profileImageView, profilePictureLoadingAnimation, and loadingTextView in onCreate()
-        profileImageView = findViewById(R.id.profileImageView)
-        profilePictureLoadingAnimation = findViewById(R.id.profilePictureLoadingAnimation)
-
-        fetchUserData()
-
-        uploadProfilePictureButton.setOnClickListener {
-            openImagePicker()
+        val name = findViewById<EditText>(R.id.editDisplayNameEditText)
+        findViewById<EditText>(R.id.editEmailEditText).apply { setText(sessionAccount.email.orEmpty()); isEnabled = false }
+        name.doAfterTextChanged { model.editName(it.toString()) }
+        findViewById<Button>(R.id.saveProfileChangesButton).setOnClickListener {
+            if (!model.state.value!!.loaded) model.reload() else model.save()
         }
-
-        saveProfileChangesButton.setOnClickListener {
-            val newDisplayName = editDisplayNameEditText.text.toString()
-            val newEmail = editEmailEditText.text.toString()
-
-            updateUserProfile(newDisplayName, newEmail, profilePictureUrl)
-
-            finish()
+        findViewById<Button>(R.id.uploadProfilePictureButton).setOnClickListener {
+            picker.launch(Intent(Intent.ACTION_OPEN_DOCUMENT).apply { type = "image/*"; addCategory(Intent.CATEGORY_OPENABLE) })
         }
-    }
-
-    private fun fetchUserData() {
-        val userId = auth.currentUser?.uid ?: ""
-        firestore.collection("users").document(userId)
-            .get()
-            .addOnSuccessListener { document ->
-                val displayName = document.getString("displayName")
-                val email = document.getString("email")
-                val profilePictureUrl = document.getString("profilePictureUrl")
-
-                val editDisplayNameEditText = findViewById<EditText>(R.id.editDisplayNameEditText)
-                val editEmailEditText = findViewById<EditText>(R.id.editEmailEditText)
-
-                editDisplayNameEditText.setText(displayName)
-                editEmailEditText.setText(email)
-
-                // Load the profile picture using Glide (if available)
-                if (profilePictureUrl != null) {
-                    Glide.with(this)
-                        .load(profilePictureUrl)
-                        .transform(CircleCrop())
-                        .into(profileImageView)
-                } else {
-                    // Handle the case where there's no profile picture
-                    profileImageView.setImageResource(R.drawable.ic_account_circle) // Or set a default image
-                }
+        model.state.observe(this) { state ->
+            if (currentSessionUid() == null) return@observe
+            if (name.text.toString() != state.name) name.setText(state.name)
+            name.isEnabled = state.loaded && !state.saving
+            val busy = state.loading || state.saving || state.uploading
+            findViewById<Button>(R.id.saveProfileChangesButton).apply {
+                isEnabled = !busy
+                setText(if (!state.loaded) R.string.account_retry else R.string.account_save)
             }
-            .addOnFailureListener { exception ->
-                Log.e("EditProfileActivity", "Error fetching user data: ${exception.message}", exception)
+            findViewById<Button>(R.id.uploadProfilePictureButton).isEnabled = state.loaded && !busy
+            findViewById<View>(R.id.profilePictureLoadingAnimation).visibility = if (busy) View.VISIBLE else View.INVISIBLE
+            findViewById<TextView>(R.id.profileStatusTextView).text = when {
+                state.saving -> getString(R.string.account_saving)
+                busy -> getString(R.string.account_working)
+                else -> state.problem?.let { getString(it.messageResource()) }.orEmpty()
             }
-    }
-
-    private fun openImagePicker() {
-        val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
-            type = "image/*"
-            addCategory(Intent.CATEGORY_OPENABLE)
-        }
-        startForResult.launch(intent)
-    }
-
-    private fun uploadImageToFirebaseStorage(imageUri: Uri?) {
-        if (imageUri != null) {
-            val storageRef = storage.reference
-            val imageName = UUID.randomUUID().toString()
-            val imageRef = storageRef.child("profile_pictures/$imageName")
-
-            // Show the loading animation and disable interaction
-            profilePictureLoadingAnimation.visibility = View.VISIBLE
-            profilePictureLoadingAnimation.repeatCount = LottieDrawable.INFINITE
-            profilePictureLoadingAnimation.repeatMode = LottieDrawable.RESTART
-            profilePictureLoadingAnimation.playAnimation()
-
-
-            window.setFlags(
-                WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE,
-                WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
-            )
-
-            imageRef.putFile(imageUri)
-                .addOnSuccessListener { taskSnapshot ->
-                    imageRef.downloadUrl.addOnSuccessListener { uri ->
-                        // Update profilePictureUrl after successful upload
-                        profilePictureUrl = uri.toString()
-                        Log.d("EditProfileActivity", "Image uploaded successfully: $profilePictureUrl")
-                        Toast.makeText(this, "Image uploaded successfully!", Toast.LENGTH_SHORT).show()
-
-                        // Stop the animation and re-enable interaction
-                        profilePictureLoadingAnimation.cancelAnimation()
-                        profilePictureLoadingAnimation.visibility = View.INVISIBLE
-                        window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
-                    }
-                }
-                .addOnFailureListener { exception ->
-                    Log.e("EditProfileActivity", "Error uploading image: ${exception.message}", exception)
-                    Toast.makeText(this, "Error uploading image", Toast.LENGTH_SHORT).show()
-
-                    // Stop the animation and re-enable interaction
-                    profilePictureLoadingAnimation.cancelAnimation()
-                    profilePictureLoadingAnimation.visibility = View.INVISIBLE
-                    window.clearFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
-                }
-        } else {
-            Toast.makeText(this, "Please select an image", Toast.LENGTH_SHORT).show()
-        }
-    }
-
-    private fun updateUserProfile(displayName: String, email: String, profilePictureUrl: String) {
-        val userId = auth.currentUser?.uid ?: ""
-        val userProfile = hashMapOf(
-            "displayName" to displayName,
-            "email" to email,
-            "profilePictureUrl" to profilePictureUrl
-        )
-        val userProfileMap: Map<String, Any> = userProfile as Map<String, Any>
-
-        firestore.collection("users").document(userId)
-            .set(userProfileMap, SetOptions.merge())
-            .addOnSuccessListener {
-                Log.d("EditProfileActivity", "User profile updated successfully")
-                Toast.makeText(this, "Profile updated successfully", Toast.LENGTH_SHORT).show()
-            }
-            .addOnFailureListener { exception ->
-                Log.e("EditProfileActivity", "Error updating user profile: ${exception.message}", exception)
-                Toast.makeText(this, "Error updating profile", Toast.LENGTH_SHORT).show()
+            if (displayedPhoto != state.photo) {
+                displayedPhoto = state.photo
+                val image = findViewById<ImageView>(R.id.profileImageView)
+                if (state.photo.isBlank()) image.setImageResource(R.drawable.ic_account_circle)
+                else Glide.with(this).load(state.photo).transform(CircleCrop()).into(image)
             }
+            if (state.saved) finish()
+        }
+        model.load(sessionAccount)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/acetimetracker/GraphActivity.kt b/app/src/main/java/com/example/acetimetracker/GraphActivity.kt
index faad6b7..e45a576 100644
--- a/app/src/main/java/com/example/acetimetracker/GraphActivity.kt
+++ b/app/src/main/java/com/example/acetimetracker/GraphActivity.kt
@@ -3,23 +3,23 @@ package com.example.acetimetracker
 import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
-import androidx.appcompat.app.AppCompatActivity
+import com.example.acetimetracker.account.AccountActivity
 import com.github.mikephil.charting.charts.PieChart
 import com.github.mikephil.charting.data.PieData
 import com.github.mikephil.charting.data.PieDataSet
 import com.github.mikephil.charting.data.PieEntry
 import com.github.mikephil.charting.formatter.PercentFormatter
 import com.github.mikephil.charting.utils.ColorTemplate
-import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FirebaseFirestore
 
-class GraphActivity : AppCompatActivity() {
+class GraphActivity : AccountActivity() {
 
     private lateinit var chart: PieChart
     private lateinit var firestore: FirebaseFirestore
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (!sessionReady) return
         setContentView(R.layout.activity_graph)
 
         chart = findViewById(R.id.chart) // Assuming you change the ID in the layout
@@ -29,11 +29,12 @@ class GraphActivity : AppCompatActivity() {
     }
 
     private fun fetchAndDisplayChartData() {
-        val userId = FirebaseAuth.getInstance().currentUser?.uid ?: ""
+        val userId = currentSessionUid() ?: return
 
         firestore.collection("users").document(userId)
             .get()
             .addOnSuccessListener { document ->
+                if (currentSessionUid() != userId) return@addOnSuccessListener
                 val dailyTimesheetEntries = document.get("dailyTimesheetEntries") as List<Map<String, Any>>?
 
                 if (dailyTimesheetEntries != null) {
diff --git a/app/src/main/java/com/example/acetimetracker/Login.kt b/app/src/main/java/com/example/acetimetracker/Login.kt
index b302661..49107df 100644
--- a/app/src/main/java/com/example/acetimetracker/Login.kt
+++ b/app/src/main/java/com/example/acetimetracker/Login.kt
@@ -1,114 +1,49 @@
 package com.example.acetimetracker
 
-import android.content.Intent
 import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
 import android.widget.Button
 import android.widget.EditText
-import android.widget.Toast
+import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
-import com.google.firebase.auth.FirebaseAuth
-import com.google.firebase.auth.auth
-import com.google.firebase.Firebase
-
-class Login : AppCompatActivity() {
-
-    private lateinit var auth: FirebaseAuth
-    private lateinit var etEmail: EditText
+import com.example.acetimetracker.account.*
 
+class Login : AuthEntryActivity() {
+    private var resetDialog: AlertDialog? = null
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login)
-
-        // Get references to UI elements
-        etEmail = findViewById(R.id.etEmail)
-        val etPassword = findViewById<EditText>(R.id.etPassword)
-        val btnLogin = findViewById<Button>(R.id.btnLogin)
-
-        // Initialize Firebase Auth instance
-        auth = FirebaseAuth.getInstance()
-
-        // Handle login button click
-        btnLogin.setOnClickListener {
-            val email = etEmail.text.toString()
-            val password = etPassword.text.toString()
-
-            // Validate user input (optional)
-            if (email.isEmpty() || password.isEmpty()) {
-                Toast.makeText(this, "Please fill in both fields", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-
-            // Attempt user login with Firebase Auth
-            auth.signInWithEmailAndPassword(email, password)
-                .addOnCompleteListener(this) { task ->
-                    if (task.isSuccessful) {
-                        // Login successful
-                        Log.d("Login", "signInWithEmailAndPassword:success")
-                        val user = auth.currentUser
-
-                        // Handle successful login (e.g., navigate to another activity)
-                        Toast.makeText(this, "Login successful!", Toast.LENGTH_SHORT).show()
-                        val intent = Intent(this, MainActivity::class.java)
-                        startActivity(intent)
-                        finish()  //
-                    } else {
-                        // Login failed
-                        Log.w("Login", "signInWithEmailAndPassword:failure", task.exception)
-                        val errorMessage = task.exception?.message.toString()
-                        Toast.makeText(this, errorMessage, Toast.LENGTH_SHORT).show()
-                    }
-                }
+        findViewById<Button>(R.id.btnLogin).setOnClickListener {
+            if (authModel.state.value?.phase == AuthPhase.PROFILE_RETRY) authModel.resume()
+            else authModel.signIn(findViewById<EditText>(R.id.etEmail).text.toString(), findViewById<EditText>(R.id.etPassword).text.toString())
         }
+        findViewById<View>(R.id.tvRegisterLink).setOnClickListener { SessionRouting.root(this, Registration::class.java) }
+        findViewById<View>(R.id.buttonDifferentAccount).setOnClickListener { authModel.useDifferentAccount() }
     }
-
-    // Handle Forgot Password Click
-    fun onForgotPasswordClick(view: View) {
-        showForgotPasswordDialog()
+    override fun render(state: AuthState) {
+        val busy = state.phase == AuthPhase.WORKING
+        findViewById<Button>(R.id.btnLogin).apply {
+            isEnabled = !busy
+            setText(if (state.phase == AuthPhase.PROFILE_RETRY) R.string.account_retry else R.string.btn_login)
+        }
+        findViewById<View>(R.id.tvRegisterLink).isEnabled = !busy
+        findViewById<View>(R.id.forgotPasswordTextView).isEnabled = !busy
+        findViewById<View>(R.id.buttonDifferentAccount).visibility = if (state.phase == AuthPhase.PROFILE_RETRY) View.VISIBLE else View.GONE
+        findViewById<TextView>(R.id.authStatusTextView).text = if (busy) getString(R.string.account_working) else state.problem?.let { getString(it.messageResource()) }.orEmpty()
+        resetDialog?.findViewById<Button>(R.id.forgotPasswordConfirmButton)?.isEnabled = !busy
     }
-
-    // Show Forgot Password Dialog
-    private fun showForgotPasswordDialog() {
-        val builder = AlertDialog.Builder(this)
-        val dialogView = LayoutInflater.from(this)
-            .inflate(R.layout.dialog_forgot_password, null) // Inflate the layout
-        builder.setView(dialogView)
-            .setTitle("Forgot Password")
-
-        // Get references to the dialog's UI elements
-        val forgotPasswordEmailEditText =
-            dialogView.findViewById<EditText>(R.id.forgotPasswordEmailEditText)
-        val forgotPasswordConfirmButton =
-            dialogView.findViewById<Button>(R.id.forgotPasswordConfirmButton)
-
-        // Handle the Confirm button click
-        forgotPasswordConfirmButton.setOnClickListener {
-            val email = forgotPasswordEmailEditText.text.toString()
-            if (email.isEmpty()) {
-                Toast.makeText(this, "Please enter your email address", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-
-            Firebase.auth.sendPasswordResetEmail(email)
-                .addOnCompleteListener(this) { task ->
-                    if (task.isSuccessful) {
-                        Log.d("Login", "Email sent.")
-                        Toast.makeText(this, "Password reset email sent.", Toast.LENGTH_SHORT)
-                            .show()
-                    } else {
-                        Log.w("Login", "sendEmailVerification", task.exception)
-                        Toast.makeText(this, "Failed to send reset email.", Toast.LENGTH_SHORT)
-                            .show()
-                    }
-                }
-            // Dismiss the dialog after confirming
-            builder.create().dismiss()
+    @Suppress("UNUSED_PARAMETER")
+    fun onForgotPasswordClick(view: View) {
+        if (resetDialog?.isShowing == true) return
+        val content = layoutInflater.inflate(R.layout.dialog_forgot_password, null)
+        val dialog = AlertDialog.Builder(this).setTitle(R.string.forgot_password).setView(content).create()
+        resetDialog = dialog
+        content.findViewById<Button>(R.id.forgotPasswordConfirmButton).setOnClickListener {
+            authModel.resetPassword(content.findViewById<EditText>(R.id.forgotPasswordEmailEditText).text.toString())
         }
-
-        // Create and show the dialog
-        builder.create().show()
+        dialog.setOnDismissListener { resetDialog = null }
+        dialog.show()
     }
+    override fun onResetSent() { resetDialog?.dismiss() }
+    override fun onDestroy() { resetDialog?.dismiss(); super.onDestroy() }
 }
diff --git a/app/src/main/java/com/example/acetimetracker/MainActivity.kt b/app/src/main/java/com/example/acetimetracker/MainActivity.kt
index 5b15594..cf089ed 100644
--- a/app/src/main/java/com/example/acetimetracker/MainActivity.kt
+++ b/app/src/main/java/com/example/acetimetracker/MainActivity.kt
@@ -2,13 +2,11 @@ package com.example.acetimetracker
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.MenuItem
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.ActionBarDrawerToggle
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.GravityCompat
 import androidx.drawerlayout.widget.DrawerLayout
@@ -16,21 +14,20 @@ import com.airbnb.lottie.LottieAnimationView
 import com.airbnb.lottie.LottieDrawable
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
+import com.example.acetimetracker.account.AccountActivity
+import com.example.acetimetracker.account.SessionRouting
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.navigation.NavigationView
-import com.google.firebase.auth.FirebaseAuth
-import com.google.firebase.firestore.FirebaseFirestore
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AccountActivity() {
 
     private lateinit var drawerLayout: DrawerLayout
     private lateinit var navigationView: NavigationView
-    private lateinit var auth: FirebaseAuth
-    private lateinit var firestore: FirebaseFirestore
     private lateinit var profilePictureLoadingAnimation: LottieAnimationView // Initialize here
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (!sessionReady) return
         setContentView(R.layout.activity_main)
 
         val toolbar = findViewById<Toolbar>(R.id.toolbar)
@@ -40,8 +37,6 @@ class MainActivity : AppCompatActivity() {
 
         drawerLayout = findViewById(R.id.drawer_layout)
         navigationView = findViewById(R.id.nav_view)
-        auth = FirebaseAuth.getInstance()
-        firestore = FirebaseFirestore.getInstance()
 
         val toggle = ActionBarDrawerToggle(
             this, drawerLayout, toolbar,
@@ -94,10 +89,8 @@ class MainActivity : AppCompatActivity() {
                     startActivity(intent)
                 }
                 R.id.nav_logout -> {
-                    FirebaseAuth.getInstance().signOut()
-                    val intent = Intent(this, Login::class.java)
-                    startActivity(intent)
-                    finish()
+                    accounts.auth.signOut()
+                    SessionRouting.root(this, Login::class.java)
                 }
             }
             true
@@ -115,26 +108,24 @@ class MainActivity : AppCompatActivity() {
         profilePictureLoadingAnimation.repeatCount = LottieDrawable.INFINITE
         profilePictureLoadingAnimation.repeatMode = LottieDrawable.RESTART
         profilePictureLoadingAnimation.playAnimation()
+    }
 
-        fetchUserData()
+    override fun onResume() {
+        super.onResume()
+        if (currentSessionUid() != null) fetchUserData()
     }
 
     private fun fetchUserData() {
-        val userId = auth.currentUser?.uid ?: ""
-        if (userId.isNotEmpty()) {
-            firestore.collection("users").document(userId)
-                .get()
-                .addOnSuccessListener { document ->
-                    val displayName = document.getString("displayName")
-                    val email = document.getString("email")
-                    val profilePictureUrl = document.getString("profilePictureUrl")
-
-                    // Update the Navigation Drawer header
-                    updateNavDrawerHeader(displayName, email, profilePictureUrl)
-                }
-                .addOnFailureListener { exception ->
-                    Log.e("MainActivity", "Error fetching user data: ${exception.message}", exception)
-                }
+        val uid = currentSessionUid() ?: return
+        updateNavDrawerHeader(sessionAccount.displayName, sessionAccount.email, sessionAccount.photoUrl)
+        accounts.profiles.ensure(sessionAccount).addOnCompleteListener { result ->
+            if (currentSessionUid() != uid) return@addOnCompleteListener
+            profilePictureLoadingAnimation.cancelAnimation()
+            profilePictureLoadingAnimation.visibility = android.view.View.INVISIBLE
+            if (result.isSuccessful) {
+                val profile = result.result
+                updateNavDrawerHeader(profile.displayName, sessionAccount.email, profile.profilePictureUrl)
+            }
         }
     }
 
@@ -147,7 +138,7 @@ class MainActivity : AppCompatActivity() {
         val emailTextView = headerView.findViewById<TextView>(R.id.nav_email_textview)
 
         // Load the profile picture (if available)
-        if (profilePictureUrl != null) {
+        if (!profilePictureUrl.isNullOrBlank()) {
             Glide.with(this)
                 .load(profilePictureUrl)
                 .transform(CircleCrop())
@@ -158,7 +149,7 @@ class MainActivity : AppCompatActivity() {
 
         // Set the display name and email
         nameTextView.text = displayName ?: "Ace! Time Tracker"
-        emailTextView.text = email ?: "st10203065@vcconnect.edu.za"
+        emailTextView.text = email.orEmpty()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/src/main/java/com/example/acetimetracker/Myprogress.kt b/app/src/main/java/com/example/acetimetracker/Myprogress.kt
index 60f121e..8cbee07 100644
--- a/app/src/main/java/com/example/acetimetracker/Myprogress.kt
+++ b/app/src/main/java/com/example/acetimetracker/Myprogress.kt
@@ -10,7 +10,7 @@ import android.widget.ArrayAdapter
 import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
+import com.example.acetimetracker.account.AccountActivity
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -20,17 +20,15 @@ import com.github.mikephil.charting.data.BarData
 import com.github.mikephil.charting.data.BarDataSet
 import com.github.mikephil.charting.data.BarEntry
 import com.github.mikephil.charting.formatter.IndexAxisValueFormatter
-import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FirebaseFirestore
 
-class Myprogress : AppCompatActivity() {
+class Myprogress : AccountActivity() {
     private lateinit var categorySpinner: Spinner
     private lateinit var recyclerView: RecyclerView
     private lateinit var timesheetAdapter: TimesheetAdapter
     private lateinit var totalAllocatedTimeTextView: TextView
     private lateinit var barChart: BarChart
-    private val firestore = FirebaseFirestore.getInstance()
-    private val auth = FirebaseAuth.getInstance()
+    private lateinit var firestore: FirebaseFirestore
 
     companion object {
         const val DATE_FORMAT = "dd/MM"
@@ -39,6 +37,8 @@ class Myprogress : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (!sessionReady) return
+        firestore = FirebaseFirestore.getInstance()
         setContentView(R.layout.activity_myprogress)
 
         recyclerView = findViewById(R.id.progRecyclerView)
@@ -83,7 +83,7 @@ class Myprogress : AppCompatActivity() {
     }
 
     private fun fetchCategories() {
-        val userId = auth.currentUser?.uid
+        val userId = currentSessionUid()
         if (userId != null) {
             Log.d(TAG, "Fetching categories for user: $userId")
 
@@ -91,6 +91,7 @@ class Myprogress : AppCompatActivity() {
                 .collection("categories")
                 .get()
                 .addOnSuccessListener { documents ->
+                    if (currentSessionUid() != userId) return@addOnSuccessListener
                     val fetchedCategories = mutableListOf<String>("Select Category")
                     Log.d(TAG, "Fetched ${documents.size()} categories")
 
@@ -126,7 +127,7 @@ class Myprogress : AppCompatActivity() {
     }
 
     private fun fetchAndDisplayProgressData(selectedCategory: String) {
-        val userId = auth.currentUser?.uid
+        val userId = currentSessionUid()
         if (userId != null) {
             Log.d(TAG, "Fetching progress data for category: $selectedCategory and user: $userId")
 
@@ -135,6 +136,7 @@ class Myprogress : AppCompatActivity() {
                 .whereEqualTo("name", selectedCategory)
                 .get()
                 .addOnSuccessListener { categoryDocuments ->
+                    if (currentSessionUid() != userId) return@addOnSuccessListener
                     if (categoryDocuments.isEmpty) {
                         Log.w(TAG, "No category document found for: $selectedCategory")
                         return@addOnSuccessListener
@@ -150,6 +152,7 @@ class Myprogress : AppCompatActivity() {
                         .orderBy("startDate")
                         .get()
                         .addOnSuccessListener { timesheetDocuments ->
+                            if (currentSessionUid() != userId) return@addOnSuccessListener
                             Log.d(TAG, "Fetched ${timesheetDocuments.size()} timesheet entries")
 
                             val timesheetEntries =
@@ -222,7 +225,7 @@ class Myprogress : AppCompatActivity() {
     }
 
     private fun fetchTimesheets() {
-        val userId = auth.currentUser?.uid
+        val userId = currentSessionUid()
         if (userId != null) {
             Log.d(TAG, "Fetching timesheets for user: $userId")
 
@@ -230,6 +233,7 @@ class Myprogress : AppCompatActivity() {
                 .whereEqualTo("userId", userId)
                 .get()
                 .addOnSuccessListener { documents ->
+                    if (currentSessionUid() != userId) return@addOnSuccessListener
                     Log.d(TAG, "Fetched ${documents.size()} timesheet entries")
 
                     val timesheets = mutableListOf<TimesheetEntry>()
diff --git a/app/src/main/java/com/example/acetimetracker/Registration.kt b/app/src/main/java/com/example/acetimetracker/Registration.kt
index 486e5a8..d549117 100644
--- a/app/src/main/java/com/example/acetimetracker/Registration.kt
+++ b/app/src/main/java/com/example/acetimetracker/Registration.kt
@@ -1,84 +1,33 @@
 package com.example.acetimetracker
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.View
 import android.widget.Button
 import android.widget.EditText
-import android.widget.Toast
-import android.util.Log
-import android.content.Intent
-import android.graphics.Typeface
-import android.text.SpannableString
-import android.text.style.StyleSpan
-import android.text.style.UnderlineSpan
 import android.widget.TextView
-import com.google.firebase.auth.FirebaseAuth
-
-class Registration : AppCompatActivity() {
-
-    private lateinit var auth: FirebaseAuth  // Declare Firebase Authentication instance
+import com.example.acetimetracker.account.*
 
+class Registration : AuthEntryActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_registration)
-
-
-        // Get references to UI elements
-        val etUsername = findViewById<EditText>(R.id.etUsername)  // Replace with your username field id
-        val etEmail = findViewById<EditText>(R.id.etEmail)
-        val etPassword = findViewById<EditText>(R.id.etPassword)
-        val etConfirmPassword = findViewById<EditText>(R.id.etConfirmPassword)
-        val btnRegister = findViewById<Button>(R.id.btnRegister)
-        val tvLoginLink = findViewById<TextView>(R.id.tvLoginLink)
-        // Initialize Firebase Auth
-        auth = FirebaseAuth.getInstance()
-
-
-        // Underline and make "Login here" text bold
-        val loginLinkText = SpannableString(tvLoginLink.text)
-        loginLinkText.setSpan(UnderlineSpan(), 0, loginLinkText.length, 0)
-        loginLinkText.setSpan(StyleSpan(Typeface.BOLD), 0, loginLinkText.length, 0)
-        tvLoginLink.text = loginLinkText
-
-        tvLoginLink.setOnClickListener {
-            // Navigate to the Login activity
-            val intent = Intent(this, Login::class.java)
-            startActivity(intent)
+        findViewById<Button>(R.id.btnRegister).setOnClickListener {
+            if (authModel.state.value?.phase == AuthPhase.PROFILE_RETRY) authModel.resume()
+            else authModel.register(findViewById<EditText>(R.id.etUsername).text.toString(),
+                findViewById<EditText>(R.id.etEmail).text.toString(), findViewById<EditText>(R.id.etPassword).text.toString(),
+                findViewById<EditText>(R.id.etConfirmPassword).text.toString())
         }
-        // Handle register button click
-        btnRegister.setOnClickListener {
-            val username = etUsername.text.toString()  // Get username (optional)
-            val email = etEmail.text.toString()
-            val password = etPassword.text.toString()
-            val confirmPassword = etConfirmPassword.text.toString()
-
-            // Validate user input (optional, implement your validation logic here)
-            if (email.isEmpty() || password.isEmpty() || confirmPassword != password) {
-                Toast.makeText(this, "Please fill in all fields and confirm password", Toast.LENGTH_SHORT).show()
-                return@setOnClickListener
-            }
-
-            // Attempt user registration with Firebase Auth
-            auth.createUserWithEmailAndPassword(email, password)
-                .addOnCompleteListener(this) { task ->
-                    if (task.isSuccessful) {
-                        // Registration successful
-                        Log.d("Registration", "createUserWithEmailAndPassword:success")
-                        val user = auth.currentUser
-
-                        // Handle successful registration (e.g., navigate to another activity)
-                        Toast.makeText(this, "Registration successful!", Toast.LENGTH_SHORT).show()
-                        // Navigate to the Login activity
-                        val intent = Intent(this, Login::class.java)
-                        startActivity(intent)
-                        finish() // Optional: Close the current activity
-                    } else {
-                        // Registration failed
-                        Log.w("Registration", "createUserWithEmailAndPassword:failure", task.exception)
-                        val errorMessage = task.exception?.message.toString()
-                        Toast.makeText(this, errorMessage, Toast.LENGTH_SHORT).show()
-                    }
-                }
+        findViewById<View>(R.id.tvLoginLink).setOnClickListener { SessionRouting.root(this, Login::class.java) }
+        findViewById<View>(R.id.buttonDifferentAccount).setOnClickListener { authModel.useDifferentAccount() }
+    }
+    override fun render(state: AuthState) {
+        val busy = state.phase == AuthPhase.WORKING
+        findViewById<Button>(R.id.btnRegister).apply {
+            isEnabled = !busy
+            setText(if (state.phase == AuthPhase.PROFILE_RETRY) R.string.account_retry else R.string.btn_register)
         }
+        findViewById<View>(R.id.tvLoginLink).isEnabled = !busy
+        findViewById<View>(R.id.buttonDifferentAccount).visibility = if (state.phase == AuthPhase.PROFILE_RETRY) View.VISIBLE else View.GONE
+        findViewById<TextView>(R.id.authStatusTextView).text = if (busy) getString(R.string.account_working) else state.problem?.let { getString(it.messageResource()) }.orEmpty()
     }
 }
diff --git a/app/src/main/java/com/example/acetimetracker/Splash.kt b/app/src/main/java/com/example/acetimetracker/Splash.kt
index a27d491..74fabad 100644
--- a/app/src/main/java/com/example/acetimetracker/Splash.kt
+++ b/app/src/main/java/com/example/acetimetracker/Splash.kt
@@ -1,36 +1,12 @@
 package com.example.acetimetracker
 
-
-import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import androidx.appcompat.app.AppCompatActivity
-
-class Splash : AppCompatActivity() {
-    private val SPLASH_DELAY: Long = 4000 // 4 seconds
-
-    private lateinit var handler: Handler
-    private lateinit var runnable: Runnable
+import com.example.acetimetracker.account.AuthEntryActivity
 
+class Splash : AuthEntryActivity() {
+    override val startup = true
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_splash)
-
-        handler = Handler(Looper.getMainLooper())
-        runnable = Runnable {
-            // Start your main activity here
-            startActivity(Intent(this@Splash, Registration::class.java))
-            finish()
-        }
-
-        // Delay the execution of the Runnable
-        handler.postDelayed(runnable, SPLASH_DELAY)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        // Remove the Runnable callback to avoid any potential memory leaks
-        handler.removeCallbacks(runnable)
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/example/acetimetracker/Timer.kt b/app/src/main/java/com/example/acetimetracker/Timer.kt
index 0df805f..f2a3df4 100644
--- a/app/src/main/java/com/example/acetimetracker/Timer.kt
+++ b/app/src/main/java/com/example/acetimetracker/Timer.kt
@@ -14,12 +14,11 @@ import android.widget.ImageButton
 import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
+import com.example.acetimetracker.account.AccountActivity
 import androidx.core.content.ContextCompat
-import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FirebaseFirestore
 
-class Timer : AppCompatActivity() {
+class Timer : AccountActivity() {
 
     private lateinit var timerTextView: TextView
     private lateinit var startButton: Button
@@ -30,7 +29,7 @@ class Timer : AppCompatActivity() {
     private lateinit var feedbackTextView: TextView
     private lateinit var btnBack: ImageButton
     private val handler = Handler()
-    private val firestore = FirebaseFirestore.getInstance()
+    private lateinit var firestore: FirebaseFirestore
 
     private var isRunning = false
     private var elapsedTime = 0L
@@ -81,10 +80,12 @@ class Timer : AppCompatActivity() {
     }
 
     private fun fetchCategories() {
+        val userId = currentSessionUid() ?: return
         val categories = mutableListOf<String>()
         firestore.collection("Category")
             .get()
             .addOnSuccessListener { documents ->
+                if (currentSessionUid() != userId) return@addOnSuccessListener
                 for (document in documents) {
                     val category = document.getString("name")
                     category?.let {
@@ -108,6 +109,8 @@ class Timer : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (!sessionReady) return
+        firestore = FirebaseFirestore.getInstance()
         setContentView(R.layout.activity_timer)
 
         editTextMinGoal = findViewById(R.id.editTextMinGoal)
@@ -142,7 +145,13 @@ class Timer : AppCompatActivity() {
         }
     }
 
+    override fun onDestroy() {
+        handler.removeCallbacks(timerRunnable)
+        super.onDestroy()
+    }
+
     private fun startTimer() {
+        if (currentSessionUid() == null) return
         startTime = SystemClock.elapsedRealtime()
         handler.postDelayed(timerRunnable, 1000)
         isRunning = true
@@ -173,6 +182,7 @@ class Timer : AppCompatActivity() {
     }
 
     private fun updateTotalTime() {
+        val currentUserId = currentSessionUid() ?: return
         val selectedCategory = categorySpinner.selectedItem.toString()
         val totalTimeRef = firestore.collection("Category").document(selectedCategory)
 
@@ -180,7 +190,6 @@ class Timer : AppCompatActivity() {
         val maxGoal = editTextMaxGoal.text.toString().toFloatOrNull()
 
         if (minGoal != null && maxGoal != null && minGoal <= maxGoal) {
-            val currentUserId = FirebaseAuth.getInstance().currentUser?.uid ?: ""
 
             // Use safe cast operator and null check for minGoal and maxGoal
             val minGoalFloat = minGoal as? Float
@@ -201,6 +210,7 @@ class Timer : AppCompatActivity() {
 
                 totalTimeRef.get()
                     .addOnSuccessListener { document ->
+                        if (currentSessionUid() != currentUserId) return@addOnSuccessListener
                         val currentTotalTime = document.getLong("totalTime") ?: 0L
                         val updatedTotalTime = currentTotalTime + elapsedTime
 
diff --git a/app/src/main/java/com/example/acetimetracker/Timesheet.kt b/app/src/main/java/com/example/acetimetracker/Timesheet.kt
index f2d7e26..61eabe9 100644
--- a/app/src/main/java/com/example/acetimetracker/Timesheet.kt
+++ b/app/src/main/java/com/example/acetimetracker/Timesheet.kt
@@ -15,9 +15,8 @@ import android.widget.ImageView
 import android.widget.Spinner
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity
+import com.example.acetimetracker.account.AccountActivity
 import com.bumptech.glide.Glide
-import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.firestore.FieldValue
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.storage.FirebaseStorage
@@ -26,10 +25,9 @@ import java.util.Calendar
 import java.util.Locale
 import java.util.UUID
 
-class Timesheet : AppCompatActivity() {
+class Timesheet : AccountActivity() {
 
     private lateinit var firestore: FirebaseFirestore
-    private lateinit var auth: FirebaseAuth
     private lateinit var adapter: ArrayAdapter<String>
     private val categoryList = ArrayList<String>()
     private var selectedImageUri: Uri? = null
@@ -41,7 +39,7 @@ class Timesheet : AppCompatActivity() {
     // Use ActivityResultLauncher for image selection
     private val startForResult =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            if (result.resultCode == Activity.RESULT_OK) {
+            if (result.resultCode == Activity.RESULT_OK && currentSessionUid() != null) {
                 selectedImageUri = result.data?.data
                 if (selectedImageUri != null) {
                     // Preview the selected image using Glide
@@ -57,18 +55,11 @@ class Timesheet : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (!sessionReady) return
         setContentView(R.layout.activity_timesheet)
 
         // Initialize Firebase
         firestore = FirebaseFirestore.getInstance()
-        auth = FirebaseAuth.getInstance()
-
-        // Check if user is authenticated
-        if (auth.currentUser == null) {
-            Toast.makeText(this, "User is not authenticated", Toast.LENGTH_SHORT).show()
-            finish() // Close the activity if the user is not authenticated
-            return
-        }
 
         // Initialize adapter
         adapter = ArrayAdapter(this, android.R.layout.simple_spinner_item, categoryList)
@@ -86,15 +77,17 @@ class Timesheet : AppCompatActivity() {
 
 
     private fun setupCategorySpinner() {
+        val userId = currentSessionUid() ?: return
         // Clear existing categoryList
         categoryList.clear()
 
         // Query Firestore for categories
         firestore.collection("users")
-            .document(auth.currentUser!!.uid)
+            .document(userId)
             .collection("categories")
             .get()
             .addOnSuccessListener { result ->
+                if (currentSessionUid() != userId) return@addOnSuccessListener
                 for (document in result) {
                     val categoryName = document.getString("name")
                     categoryName?.let { categoryList.add(it) }
@@ -125,6 +118,7 @@ class Timesheet : AppCompatActivity() {
     }
 
     private fun uploadImageToFirebaseStorage(imageUri: Uri?) {
+        val userId = currentSessionUid() ?: return
         if (imageUri != null) {
             val storageReference = FirebaseStorage.getInstance().reference
             val imageRef = storageReference.child("images/${UUID.randomUUID()}")
@@ -132,6 +126,7 @@ class Timesheet : AppCompatActivity() {
                 .addOnSuccessListener { taskSnapshot ->
                     // Image uploaded successfully, get the download URL
                     imageRef.downloadUrl.addOnSuccessListener { uri ->
+                        if (currentSessionUid() != userId) return@addOnSuccessListener
                         // Save the download URL to the timesheet entry and show success message
                         selectedImageUri = uri // Update the URI to use later
                         showToast("Image uploaded successfully")
@@ -222,7 +217,7 @@ class Timesheet : AppCompatActivity() {
         val timeSpentInMillis = calculateTimeSpent(startTime, endTime)
         val totalHoursWorked = timeSpentInMillis / (1000 * 60 * 60).toDouble()
 
-        val currentUserId = auth.currentUser?.uid ?: ""
+        val currentUserId = currentSessionUid() ?: return
 
         val entryData = hashMapOf(
             "date" to startDate,
@@ -234,6 +229,7 @@ class Timesheet : AppCompatActivity() {
         firestore.collection("users").document(currentUserId)
             .update("dailyTimesheetEntries", FieldValue.arrayUnion(entryData))
             .addOnSuccessListener {
+                if (currentSessionUid() != currentUserId) return@addOnSuccessListener
                 showToast("Timesheet entry saved successfully")
                 Log.d("TimesheetActivity", "Timesheet entry saved: $entryData")
                 // Clear input fields after successful save
diff --git a/app/src/main/java/com/example/acetimetracker/account/AccountServices.kt b/app/src/main/java/com/example/acetimetracker/account/AccountServices.kt
new file mode 100644
index 0000000..a0702fa
--- /dev/null
+++ b/app/src/main/java/com/example/acetimetracker/account/AccountServices.kt
@@ -0,0 +1,40 @@
+package com.example.acetimetracker.account
+
+import android.net.Uri
+import com.google.android.gms.tasks.Task
+
+data class Account(val uid: String, val email: String? = null, val displayName: String? = null, val photoUrl: String? = null) {
+    init { require(uid.isNotBlank()) }
+}
+data class UserProfile(val displayName: String = "", val email: String = "", val profilePictureUrl: String = "")
+
+interface AccountAuth {
+    val current: Account?
+    fun signIn(email: String, password: String): Task<Account>
+    fun register(email: String, password: String): Task<Account>
+    fun resetPassword(email: String): Task<Void>
+    fun signOut()
+    fun observe(listener: (Account?) -> Unit): () -> Unit
+}
+interface Profiles {
+    fun ensure(account: Account, preferredName: String? = null): Task<UserProfile>
+    fun update(uid: String, fields: Map<String, String>): Task<Void>
+}
+interface ProfilePhotos { fun upload(uid: String, uri: Uri): Task<String> }
+data class AccountServices(val auth: AccountAuth, val profiles: Profiles, val photos: ProfilePhotos)
+
+object ProfileFields {
+    fun missing(existing: Map<String, Any?>, account: Account, preferredName: String? = null): Map<String, String> =
+        mapOf("displayName" to (preferredName?.trim()?.takeIf { it.isNotEmpty() } ?: account.displayName.orEmpty()),
+            "email" to account.email.orEmpty(), "profilePictureUrl" to account.photoUrl.orEmpty())
+            .filterKeys { !existing.containsKey(it) }
+
+    fun edit(displayName: String, newPhotoUrl: String?): Map<String, String> = buildMap {
+        put("displayName", displayName.trim())
+        if (newPhotoUrl != null) put("profilePictureUrl", newPhotoUrl)
+    }
+
+    fun read(fields: Map<String, Any?>): UserProfile = UserProfile(
+        fields["displayName"] as? String ?: "", fields["email"] as? String ?: "",
+        fields["profilePictureUrl"] as? String ?: "")
+}
diff --git a/app/src/main/java/com/example/acetimetracker/account/AccountViewModels.kt b/app/src/main/java/com/example/acetimetracker/account/AccountViewModels.kt
new file mode 100644
index 0000000..494b4b4
--- /dev/null
+++ b/app/src/main/java/com/example/acetimetracker/account/AccountViewModels.kt
@@ -0,0 +1,165 @@
+package com.example.acetimetracker.account
+
+import android.net.Uri
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.gms.tasks.Task
+
+enum class AccountProblem { INPUT, SIGN_IN, REGISTRATION, PROFILE_SETUP, PASSWORD_RESET, PROFILE_SAVE, UPLOAD, SESSION_CHANGED }
+enum class AuthPhase { IDLE, SIGNED_OUT, WORKING, READY, PROFILE_RETRY, ERROR, RESET_SENT }
+data class AuthState(val phase: AuthPhase = AuthPhase.IDLE, val uid: String? = null, val problem: AccountProblem? = null)
+
+class AuthViewModel(private val services: AccountServices) : ViewModel() {
+    private val mutable = MutableLiveData(AuthState())
+    val state: LiveData<AuthState> = mutable
+    private var generation = 0
+    private var cleared = false
+    private var preferredName: String? = null
+    private var preferredUid: String? = null
+    private val busy get() = mutable.value?.phase == AuthPhase.WORKING
+    private val stopObserving = services.auth.observe { account ->
+        val currentState = mutable.value!!
+        // A restored identity can arrive after onStart. In-flight registration owns
+        // its chosen-name bootstrap; same-UID setup failures still require retry.
+        if (!cleared && !busy && (account?.uid != currentState.uid || currentState.phase == AuthPhase.IDLE)) {
+            resume()
+        }
+    }
+
+    fun resume() {
+        if (busy) return
+        val account = services.auth.current
+        if (account == null) { mutable.value = AuthState(AuthPhase.SIGNED_OUT); return }
+        if (mutable.value?.phase == AuthPhase.READY && mutable.value?.uid == account.uid) return
+        val request = ++generation
+        mutable.value = AuthState(AuthPhase.WORKING)
+        bootstrap(account, if (preferredUid == account.uid) preferredName else null, request)
+    }
+    fun signIn(email: String, password: String) {
+        if (busy) return
+        if (email.isBlank() || password.isEmpty()) { fail(AccountProblem.INPUT); return }
+        authenticate(null, AccountProblem.SIGN_IN) { services.auth.signIn(email.trim(), password) }
+    }
+    fun register(name: String, email: String, password: String, confirmation: String) {
+        if (busy) return
+        if (name.isBlank() || email.isBlank() || password.isEmpty() || password != confirmation) { fail(AccountProblem.INPUT); return }
+        authenticate(name.trim(), AccountProblem.REGISTRATION) { services.auth.register(email.trim(), password) }
+    }
+    private fun authenticate(name: String?, problem: AccountProblem, action: () -> Task<Account>) {
+        val request = ++generation
+        mutable.value = AuthState(AuthPhase.WORKING)
+        action().addOnCompleteListener { result ->
+            if (cleared || request != generation) return@addOnCompleteListener
+            if (!result.isSuccessful) {
+                fail(problem)
+                if (services.auth.current != null) resume()
+                return@addOnCompleteListener
+            }
+            val account = result.result
+            if (!current(account.uid, request)) return@addOnCompleteListener
+            preferredName = name; preferredUid = account.uid
+            bootstrap(account, name, request)
+        }
+    }
+    private fun bootstrap(account: Account, name: String?, request: Int) {
+        services.profiles.ensure(account, name).addOnCompleteListener { result ->
+            if (!current(account.uid, request)) return@addOnCompleteListener
+            mutable.value = if (result.isSuccessful) AuthState(AuthPhase.READY, account.uid)
+                else AuthState(AuthPhase.PROFILE_RETRY, account.uid, AccountProblem.PROFILE_SETUP)
+        }
+    }
+    private fun current(uid: String, request: Int): Boolean {
+        if (cleared || request != generation) return false
+        if (services.auth.current?.uid == uid) return true
+        mutable.value = AuthState(AuthPhase.IDLE)
+        resume()
+        return false
+    }
+    fun resetPassword(email: String) {
+        if (busy) return
+        if (email.isBlank()) { fail(AccountProblem.INPUT); return }
+        val request = ++generation
+        mutable.value = AuthState(AuthPhase.WORKING)
+        services.auth.resetPassword(email.trim()).addOnCompleteListener { result ->
+            if (cleared || request != generation) return@addOnCompleteListener
+            if (result.isSuccessful) mutable.value = AuthState(AuthPhase.RESET_SENT) else fail(AccountProblem.PASSWORD_RESET)
+            // Auth notifications are deferred while reset is working as well.
+            if (services.auth.current != null) resume()
+        }
+    }
+    fun useDifferentAccount() {
+        ++generation; preferredUid = null; preferredName = null
+        services.auth.signOut(); mutable.value = AuthState(AuthPhase.SIGNED_OUT)
+    }
+    fun acknowledgeReset() { if (mutable.value?.phase == AuthPhase.RESET_SENT) mutable.value = AuthState() }
+    private fun fail(problem: AccountProblem) { mutable.value = AuthState(AuthPhase.ERROR, problem = problem) }
+    override fun onCleared() { cleared = true; ++generation; stopObserving() }
+}
+
+data class ProfileState(val loading: Boolean = true, val loaded: Boolean = false, val name: String = "",
+    val photo: String = "", val saving: Boolean = false, val uploading: Boolean = false,
+    val saved: Boolean = false, val problem: AccountProblem? = null)
+
+class ProfileViewModel(private val services: AccountServices) : ViewModel() {
+    private val mutable = MutableLiveData(ProfileState())
+    val state: LiveData<ProfileState> = mutable
+    private var owner: Account? = null
+    private var newPhoto: String? = null
+    private var cleared = false
+    private fun current(): Boolean = !cleared && owner != null && services.auth.current?.uid == owner?.uid
+    fun load(account: Account) {
+        if (owner != null) return
+        owner = account
+        reload()
+    }
+    fun reload() {
+        val account = owner ?: return
+        if (!current()) return
+        mutable.value = ProfileState()
+        services.profiles.ensure(account).addOnCompleteListener { result ->
+            if (!current()) return@addOnCompleteListener
+            mutable.value = if (result.isSuccessful) ProfileState(loading = false, loaded = true,
+                name = result.result.displayName, photo = result.result.profilePictureUrl)
+                else ProfileState(loading = false, problem = AccountProblem.PROFILE_SETUP)
+        }
+    }
+    fun editName(value: String) {
+        val s = mutable.value ?: return
+        if (s.loaded && !s.saving && s.name != value) mutable.value = s.copy(name = value, problem = null)
+    }
+    fun save() {
+        val s = mutable.value ?: return
+        if (!current() || !s.loaded || s.saving || s.uploading) return
+        if (s.name.isBlank()) { mutable.value = s.copy(problem = AccountProblem.INPUT); return }
+        mutable.value = s.copy(saving = true, problem = null)
+        services.profiles.update(owner!!.uid, ProfileFields.edit(s.name, newPhoto)).addOnCompleteListener { result ->
+            if (!current()) return@addOnCompleteListener
+            mutable.value = mutable.value!!.copy(saving = false, saved = result.isSuccessful,
+                problem = if (result.isSuccessful) null else AccountProblem.PROFILE_SAVE)
+        }
+    }
+    fun upload(uri: Uri) {
+        val s = mutable.value ?: return
+        if (!current() || !s.loaded || s.saving || s.uploading) return
+        mutable.value = s.copy(uploading = true, problem = null)
+        services.photos.upload(owner!!.uid, uri).addOnCompleteListener { result ->
+            if (!current()) return@addOnCompleteListener
+            if (result.isSuccessful) newPhoto = result.result
+            mutable.value = mutable.value!!.copy(uploading = false,
+                photo = if (result.isSuccessful) result.result else mutable.value!!.photo,
+                problem = if (result.isSuccessful) null else AccountProblem.UPLOAD)
+        }
+    }
+    override fun onCleared() { cleared = true }
+}
+
+class AccountViewModelFactory(private val services: AccountServices) : ViewModelProvider.Factory {
+    @Suppress("UNCHECKED_CAST")
+    override fun <T : ViewModel> create(modelClass: Class<T>): T = when (modelClass) {
+        AuthViewModel::class.java -> AuthViewModel(services) as T
+        ProfileViewModel::class.java -> ProfileViewModel(services) as T
+        else -> throw IllegalArgumentException("Unknown account ViewModel")
+    }
+}
diff --git a/app/src/main/java/com/example/acetimetracker/account/AuthEntryActivity.kt b/app/src/main/java/com/example/acetimetracker/account/AuthEntryActivity.kt
new file mode 100644
index 0000000..623958d
--- /dev/null
+++ b/app/src/main/java/com/example/acetimetracker/account/AuthEntryActivity.kt
@@ -0,0 +1,43 @@
+package com.example.acetimetracker.account
+
+import android.os.Bundle
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModelProvider
+import com.example.acetimetracker.AceApplication
+import com.example.acetimetracker.Login
+import com.example.acetimetracker.R
+
+abstract class AuthEntryActivity : AppCompatActivity() {
+    protected val accounts get() = (application as AceApplication).accounts
+    protected val authModel by lazy { ViewModelProvider(this, AccountViewModelFactory(accounts))[AuthViewModel::class.java] }
+    protected open val startup = false
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        authModel.state.observe(this) { state ->
+            render(state)
+            when (state.phase) {
+                AuthPhase.READY -> if (accounts.auth.current?.uid == state.uid) SessionRouting.home(this, state.uid!!) else authModel.resume()
+                AuthPhase.SIGNED_OUT, AuthPhase.PROFILE_RETRY -> if (startup) SessionRouting.root(this, Login::class.java)
+                AuthPhase.RESET_SENT -> {
+                    onResetSent(); Toast.makeText(this, R.string.account_reset_sent, Toast.LENGTH_LONG).show(); authModel.acknowledgeReset()
+                }
+                else -> Unit
+            }
+        }
+    }
+    override fun onStart() { super.onStart(); authModel.resume() }
+    protected open fun render(state: AuthState) = Unit
+    protected open fun onResetSent() = Unit
+}
+
+fun AccountProblem.messageResource(): Int = when (this) {
+    AccountProblem.INPUT -> R.string.account_invalid_input
+    AccountProblem.SIGN_IN -> R.string.account_sign_in_failed
+    AccountProblem.REGISTRATION -> R.string.account_registration_failed
+    AccountProblem.PROFILE_SETUP -> R.string.account_profile_retry
+    AccountProblem.PASSWORD_RESET -> R.string.account_reset_failed
+    AccountProblem.PROFILE_SAVE -> R.string.account_save_failed
+    AccountProblem.UPLOAD -> R.string.account_upload_failed
+    AccountProblem.SESSION_CHANGED -> R.string.account_session_changed
+}
diff --git a/app/src/main/java/com/example/acetimetracker/account/FirebaseAccountServices.kt b/app/src/main/java/com/example/acetimetracker/account/FirebaseAccountServices.kt
new file mode 100644
index 0000000..c0bab2f
--- /dev/null
+++ b/app/src/main/java/com/example/acetimetracker/account/FirebaseAccountServices.kt
@@ -0,0 +1,67 @@
+package com.example.acetimetracker.account
+
+import android.net.Uri
+import com.google.android.gms.tasks.Task
+import com.google.android.gms.tasks.Tasks
+import com.google.firebase.auth.FirebaseAuth
+import com.google.firebase.auth.FirebaseUser
+import com.google.firebase.firestore.FirebaseFirestore
+import com.google.firebase.firestore.SetOptions
+import com.google.firebase.firestore.Source
+import com.google.firebase.storage.FirebaseStorage
+import com.google.firebase.storage.StorageMetadata
+import java.util.UUID
+
+fun firebaseAccountServices(): AccountServices = AccountServices(FirebaseAccountAuth(), FirebaseProfiles(), FirebaseProfilePhotos())
+
+private fun FirebaseUser.account() = Account(uid, email, displayName, photoUrl?.toString())
+
+private class FirebaseAccountAuth : AccountAuth {
+    private val auth get() = FirebaseAuth.getInstance()
+    override val current get() = auth.currentUser?.account()
+    override fun signIn(email: String, password: String): Task<Account> =
+        auth.signInWithEmailAndPassword(email, password).onSuccessTask { Tasks.forResult(requireNotNull(it.user).account()) }
+    override fun register(email: String, password: String): Task<Account> =
+        auth.createUserWithEmailAndPassword(email, password).onSuccessTask { Tasks.forResult(requireNotNull(it.user).account()) }
+    override fun resetPassword(email: String): Task<Void> = auth.sendPasswordResetEmail(email)
+    override fun signOut() = auth.signOut()
+    override fun observe(listener: (Account?) -> Unit): () -> Unit {
+        val firebaseListener = FirebaseAuth.AuthStateListener { listener(it.currentUser?.account()) }
+        auth.addAuthStateListener(firebaseListener)
+        return { auth.removeAuthStateListener(firebaseListener) }
+    }
+}
+
+private class FirebaseProfiles : Profiles {
+    private val db get() = FirebaseFirestore.getInstance()
+    override fun ensure(account: Account, preferredName: String?): Task<UserProfile> {
+        val ref = db.collection("users").document(account.uid)
+        return db.runTransaction { transaction ->
+            val existing = transaction.get(ref).data.orEmpty()
+            val missing = ProfileFields.missing(existing, account, preferredName)
+            if (missing.isNotEmpty()) transaction.set(ref, missing, SetOptions.merge())
+            ProfileFields.read(existing + missing)
+        }.continueWithTask { result ->
+            if (result.isSuccessful) Tasks.forResult(result.result)
+            else ref.get(Source.CACHE).continueWith { cached ->
+                if (!cached.isSuccessful || !cached.result.exists()) throw (result.exception ?: IllegalStateException("Profile setup unavailable"))
+                // Existing cached accounts can open offline; no synthetic profile is written.
+                ProfileFields.read(cached.result.data.orEmpty())
+            }
+        }
+    }
+    override fun update(uid: String, fields: Map<String, String>): Task<Void> {
+        require(uid.isNotBlank())
+        require(fields.keys.all { it == "displayName" || it == "profilePictureUrl" })
+        return db.collection("users").document(uid).set(fields, SetOptions.merge())
+    }
+}
+
+private class FirebaseProfilePhotos : ProfilePhotos {
+    override fun upload(uid: String, uri: Uri): Task<String> {
+        require(uid.isNotBlank())
+        val ref = FirebaseStorage.getInstance().reference.child("profile_pictures/$uid/${UUID.randomUUID()}")
+        val metadata = StorageMetadata.Builder().setCustomMetadata("ownerUid", uid).build()
+        return ref.putFile(uri, metadata).onSuccessTask { ref.downloadUrl }.onSuccessTask { Tasks.forResult(it.toString()) }
+    }
+}
diff --git a/app/src/main/java/com/example/acetimetracker/account/SessionRouting.kt b/app/src/main/java/com/example/acetimetracker/account/SessionRouting.kt
new file mode 100644
index 0000000..60e8a5d
--- /dev/null
+++ b/app/src/main/java/com/example/acetimetracker/account/SessionRouting.kt
@@ -0,0 +1,59 @@
+package com.example.acetimetracker.account
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.example.acetimetracker.AceApplication
+import com.example.acetimetracker.Login
+import com.example.acetimetracker.MainActivity
+import com.example.acetimetracker.Splash
+
+object SessionRouting {
+    const val OWNER = "account_session_owner"
+    fun root(activity: Activity, target: Class<out Activity>, uid: String? = null) {
+        if (activity.isFinishing || activity.isDestroyed) return
+        activity.startActivity(Intent(activity, target).apply {
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            if (uid != null) putExtra(OWNER, uid)
+        })
+        activity.finish()
+    }
+    fun home(activity: Activity, uid: String) = root(activity, MainActivity::class.java, uid)
+    fun entry(activity: Activity, account: Account?) = root(activity, if (account == null) Login::class.java else Splash::class.java)
+}
+
+open class AccountActivity : AppCompatActivity() {
+    protected val accounts get() = (application as AceApplication).accounts
+    protected lateinit var sessionAccount: Account
+    protected var sessionReady = false
+        private set
+    private var stopObserving: (() -> Unit)? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val current = accounts.auth.current
+        val previous = savedInstanceState?.getString(SessionRouting.OWNER) ?: intent.getStringExtra(SessionRouting.OWNER)
+        if (current == null || (previous != null && previous != current.uid)) {
+            SessionRouting.entry(this, current); return
+        }
+        sessionAccount = current; sessionReady = true
+    }
+    override fun onStart() {
+        super.onStart()
+        if (!sessionReady) return
+        if (currentSessionUid() == null) {
+            SessionRouting.entry(this, accounts.auth.current)
+            return
+        }
+        stopObserving = accounts.auth.observe { current ->
+            if (current?.uid != sessionAccount.uid) SessionRouting.entry(this, current)
+        }
+    }
+    override fun onStop() { stopObserving?.invoke(); stopObserving = null; super.onStop() }
+    override fun onSaveInstanceState(outState: Bundle) {
+        if (sessionReady) outState.putString(SessionRouting.OWNER, sessionAccount.uid)
+        super.onSaveInstanceState(outState)
+    }
+    protected fun currentSessionUid(): String? = if (sessionReady && !isFinishing && !isDestroyed && accounts.auth.current?.uid == sessionAccount.uid) sessionAccount.uid else null
+}
diff --git a/app/src/main/java/com/example/acetimetracker/profile.kt b/app/src/main/java/com/example/acetimetracker/profile.kt
index 73edbfa..b5aebff 100644
--- a/app/src/main/java/com/example/acetimetracker/profile.kt
+++ b/app/src/main/java/com/example/acetimetracker/profile.kt
@@ -2,73 +2,35 @@ package com.example.acetimetracker
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.widget.Button
 import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.ViewModelProvider
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.bitmap.CircleCrop
-import com.google.firebase.auth.FirebaseAuth
-import com.google.firebase.firestore.FirebaseFirestore
-
-class profile : AppCompatActivity() {
-
-    private lateinit var auth: FirebaseAuth
-    private lateinit var firestore: FirebaseFirestore
+import com.example.acetimetracker.account.*
 
+class profile : AccountActivity() {
+    private val model by lazy { ViewModelProvider(this, AccountViewModelFactory(accounts))[ProfileViewModel::class.java] }
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        if (!sessionReady) return
         setContentView(R.layout.activity_profile)
-
-        auth = FirebaseAuth.getInstance()
-        firestore = FirebaseFirestore.getInstance()
-
-        val btnBack = findViewById<ImageButton>(R.id.btnBack)
-        btnBack.setOnClickListener {
-            onBackPressed()
-        }
-
-        val editProfileButton = findViewById<Button>(R.id.editProfileButton)
-        editProfileButton.setOnClickListener {
-            val intent = Intent(this, EditProfileActivity::class.java)
-            startActivity(intent)
+        findViewById<ImageButton>(R.id.btnBack).setOnClickListener { onBackPressedDispatcher.onBackPressed() }
+        findViewById<Button>(R.id.editProfileButton).setOnClickListener { startActivity(Intent(this, EditProfileActivity::class.java)) }
+        findViewById<TextView>(R.id.emailTextView).text = sessionAccount.email.orEmpty()
+        model.state.observe(this) { state ->
+            if (currentSessionUid() == null) return@observe
+            findViewById<TextView>(R.id.displayNameTextView).text = state.name.ifBlank { sessionAccount.displayName.orEmpty() }
+            val image = findViewById<ImageView>(R.id.profileImageView)
+            if (state.photo.isBlank()) image.setImageResource(R.drawable.ic_account_circle)
+            else Glide.with(this).load(state.photo).transform(CircleCrop()).into(image)
         }
-
-        fetchUserData()
+        model.load(sessionAccount)
     }
-
-    private fun fetchUserData() {
-        val userId = auth.currentUser?.uid ?: ""
-        firestore.collection("users").document(userId)
-            .get()
-            .addOnSuccessListener { document ->
-                val displayName = document.getString("displayName")
-                val email = document.getString("email")
-                val profilePictureUrl = document.getString("profilePictureUrl")
-
-                val displayNameTextView = findViewById<TextView>(R.id.displayNameTextView)
-                val emailTextView = findViewById<TextView>(R.id.emailTextView)
-                val profileImageView = findViewById<ImageView>(R.id.profileImageView)
-
-                displayNameTextView.text = displayName ?: "Display Name"
-                emailTextView.text = email ?: "Email Address"
-
-                // Load the profile picture using Glide (if available)
-                if (profilePictureUrl != null) {
-                    Glide.with(this)
-                        .load(profilePictureUrl)
-                        .transform(CircleCrop()) // Apply the circular transformation
-                        .into(profileImageView)
-                }
-            }
-            .addOnFailureListener { exception ->
-                Log.e("profileActivity", "Error fetching user data: ${exception.message}", exception)
-            }
-
-            .addOnFailureListener { exception ->
-                Log.e("profileActivity", "Error fetching user data: ${exception.message}", exception)
-            }
+    override fun onResume() {
+        super.onResume()
+        if (sessionReady && model.state.value?.loaded == true) model.reload()
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/activity_edit_profile.xml b/app/src/main/res/layout/activity_edit_profile.xml
index ab043b5..53a0d37 100644
--- a/app/src/main/res/layout/activity_edit_profile.xml
+++ b/app/src/main/res/layout/activity_edit_profile.xml
@@ -28,7 +28,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Email Address:"
+            android:text="@string/account_sign_in_email"
             android:layout_marginTop="16dp" />
 
         <EditText
@@ -68,10 +68,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:backgroundTint="@color/red"
-            android:text="Save Changes"
+            android:text="@string/account_save"
             android:textColor="#000000"
             android:layout_gravity="center_horizontal" />
 
+        <TextView android:id="@+id/profileStatusTextView" android:layout_width="match_parent" android:layout_height="wrap_content" android:accessibilityLiveRegion="polite" />
     </LinearLayout>
 
     <com.airbnb.lottie.LottieAnimationView
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index ce1e0be..6e54f30 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -25,7 +25,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="290dp"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="16dp">
 
@@ -64,7 +64,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:autofillHints=""
-                    android:inputType="textPassword" />
+                    android:inputType="textPassword"
+                    android:saveEnabled="false" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -74,6 +75,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/btn_login" />
+            <TextView android:id="@+id/authStatusTextView" android:layout_width="match_parent" android:layout_height="wrap_content" android:accessibilityLiveRegion="polite" />
+            <Button android:id="@+id/buttonDifferentAccount" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/account_different" android:visibility="gone" />
+            <TextView android:id="@+id/tvRegisterLink" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/account_create" android:minHeight="48dp" android:gravity="center" android:clickable="true" android:focusable="true" />
+
 
             <TextView
                 android:id="@+id/forgotPasswordTextView"
diff --git a/app/src/main/res/layout/activity_registration.xml b/app/src/main/res/layout/activity_registration.xml
index df8a845..e6a1c44 100644
--- a/app/src/main/res/layout/activity_registration.xml
+++ b/app/src/main/res/layout/activity_registration.xml
@@ -20,7 +20,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="455dp"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="16dp"
             tools:ignore="TextSizeCheck">
@@ -69,7 +69,8 @@
                     android:id="@+id/etPassword"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="textPassword" />
+                    android:inputType="textPassword"
+                    android:saveEnabled="false" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -83,7 +84,8 @@
                     android:id="@+id/etConfirmPassword"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:inputType="textPassword" />
+                    android:inputType="textPassword"
+                    android:saveEnabled="false" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -93,6 +95,9 @@ android:backgroundTint="@color/red"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/btn_register" />
+            <TextView android:id="@+id/authStatusTextView" android:layout_width="match_parent" android:layout_height="wrap_content" android:accessibilityLiveRegion="polite" />
+            <Button android:id="@+id/buttonDifferentAccount" android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/account_different" android:visibility="gone" />
+
 
             <TextView
                 android:id="@+id/tvLoginLink"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a9c9b8f..40d5200 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,4 +82,20 @@
     <string name="profile_upload_profile_picture">Upload Profile Picture</string>
 
 
+    <string name="account_retry">Retry profile setup</string>
+    <string name="account_working">Please wait…</string>
+    <string name="account_invalid_input">Fill in all fields and confirm your password.</string>
+    <string name="account_sign_in_failed">Sign-in failed. Check your details and try again.</string>
+    <string name="account_registration_failed">Registration failed. Check your details and try again.</string>
+    <string name="account_profile_retry">You are signed in. Profile setup could not finish. Retry when connected.</string>
+    <string name="account_reset_failed">Could not send the reset email. Try again.</string>
+    <string name="account_reset_sent">If an account exists for this address, a password reset email has been sent.</string>
+    <string name="account_save_failed">Could not save your profile. Your changes are still here; try again.</string>
+    <string name="account_upload_failed">Could not upload the photo. Your existing photo is unchanged.</string>
+    <string name="account_session_changed">Your account changed. Sign in again.</string>
+    <string name="account_saving">Saving… Waiting for confirmation.</string>
+    <string name="account_save">Save changes</string>
+    <string name="account_different">Use a different account</string>
+    <string name="account_create">Create an account</string>
+    <string name="account_sign_in_email">Sign-in email (read-only)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/example/acetimetracker/account/AccountScreensTest.kt b/app/src/test/java/com/example/acetimetracker/account/AccountScreensTest.kt
new file mode 100644
index 0000000..2a798d1
--- /dev/null
+++ b/app/src/test/java/com/example/acetimetracker/account/AccountScreensTest.kt
@@ -0,0 +1,201 @@
+package com.example.acetimetracker.account
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.Looper
+import android.widget.Button
+import android.widget.EditText
+import com.example.acetimetracker.*
+import com.google.android.gms.tasks.TaskCompletionSource
+import com.google.android.gms.tasks.Tasks
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+import org.robolectric.shadows.ShadowDialog
+
+class AccountTestApplication : AceApplication() {
+    val fixture = FakeAccounts()
+    override val accounts get() = fixture.services
+}
+class GuardedTestActivity : AccountActivity()
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [36], application = AccountTestApplication::class)
+class AccountScreensTest {
+    private lateinit var f: FakeAccounts
+    private val a = Account("a", "login@example.com")
+    @Before fun fixture() { f = (RuntimeEnvironment.getApplication() as AccountTestApplication).fixture }
+    private fun drain() = shadowOf(Looper.getMainLooper()).idle()
+    private fun splash(): org.robolectric.android.controller.ActivityController<Splash> {
+        val controller = Robolectric.buildActivity(Splash::class.java)
+        // Replace only the decorative native GIF; inflate the real screen and exercise real routing.
+        controller.get().layoutInflater.factory2 = object : android.view.LayoutInflater.Factory2 {
+            override fun onCreateView(parent: android.view.View?, name: String, context: android.content.Context, attrs: android.util.AttributeSet): android.view.View? =
+                if (name == "pl.droidsonroids.gif.GifImageView") android.widget.ImageView(context) else null
+            override fun onCreateView(name: String, context: android.content.Context, attrs: android.util.AttributeSet) = onCreateView(null, name, context, attrs)
+        }
+        return controller
+    }
+    private fun assertRoot(intent: Intent, target: Class<*>) {
+        assertEquals(target.name, intent.component!!.className)
+        assertTrue(intent.flags and Intent.FLAG_ACTIVITY_CLEAR_TASK != 0)
+        assertTrue(intent.flags and Intent.FLAG_ACTIVITY_NEW_TASK != 0)
+    }
+    @Test fun signedOutLaunchOpensLoginWithoutForcedDelay() {
+        val c = splash().setup(); drain()
+        assertRoot(shadowOf(c.get()).nextStartedActivity, Login::class.java); c.pause().stop().destroy()
+    }
+    @Test fun loginRoutesWhenPersistedIdentityArrivesAfterStartup() {
+        val c = Robolectric.buildActivity(Login::class.java).setup(); drain()
+        assertNull(shadowOf(c.get()).nextStartedActivity)
+        f.auth.change(a); drain()
+        assertRoot(shadowOf(c.get()).nextStartedActivity, MainActivity::class.java)
+        c.pause().stop().destroy(); assertTrue(f.auth.listeners.isEmpty())
+    }
+    @Test fun persistedSessionOpensHomeAfterProfileInitialization() {
+        f.auth.account = a
+        val c = splash().setup(); drain()
+        assertRoot(shadowOf(c.get()).nextStartedActivity, MainActivity::class.java)
+        assertEquals("a", f.profiles.ensures.single().first); c.pause().stop().destroy()
+    }
+    @Test fun protectedScreenRejectsSignedOutSession() {
+        val c = Robolectric.buildActivity(GuardedTestActivity::class.java).setup(); drain()
+        assertRoot(shadowOf(c.get()).nextStartedActivity, Login::class.java); c.pause().stop().destroy()
+    }
+    @Test fun everyAccountScreenRejectsSignedOutSessionBeforeAccessingFirebase() {
+        val screens = listOf(MainActivity::class.java, profile::class.java, EditProfileActivity::class.java,
+            Categories::class.java, Timer::class.java, Timesheet::class.java, Myprogress::class.java, GraphActivity::class.java)
+        screens.forEach { screen ->
+            val c = Robolectric.buildActivity(screen).setup(); drain()
+            assertRoot(shadowOf(c.get()).nextStartedActivity, Login::class.java)
+            c.pause().stop().destroy()
+        }
+    }
+    @Test fun homeShowsAuthEmailAndLogoutClearsAccountTask() {
+        f.auth.account = a
+        f.profiles.ensureResult = Tasks.forResult(UserProfile("Existing", "stale@example.com", ""))
+        val c = Robolectric.buildActivity(MainActivity::class.java).setup(); drain()
+        val navigation = c.get().findViewById<com.google.android.material.navigation.NavigationView>(R.id.nav_view)
+        assertEquals("login@example.com", navigation.getHeaderView(0).findViewById<android.widget.TextView>(R.id.nav_email_textview).text.toString())
+        navigation.menu.performIdentifierAction(R.id.nav_logout, 0); drain()
+        assertNull(f.auth.current)
+        assertRoot(shadowOf(c.get()).nextStartedActivity, Login::class.java)
+        c.pause().stop().destroy()
+    }
+    @Test fun rotatingDuringProfileSaveRetainsDraftAndDoesNotSubmitTwice() {
+        f.auth.account = a
+        val pending = TaskCompletionSource<Void>(); f.profiles.updateResult = pending.task
+        val c = Robolectric.buildActivity(EditProfileActivity::class.java).setup(); drain()
+        c.get().findViewById<EditText>(R.id.editDisplayNameEditText).setText("Draft")
+        c.get().findViewById<Button>(R.id.saveProfileChangesButton).performClick(); drain()
+        c.recreate(); drain()
+        assertEquals("Draft", c.get().findViewById<EditText>(R.id.editDisplayNameEditText).text.toString())
+        assertFalse(c.get().findViewById<Button>(R.id.saveProfileChangesButton).isEnabled)
+        assertEquals(1, f.profiles.updates.size)
+        pending.setResult(null); drain(); assertTrue(c.get().isFinishing)
+        c.pause().stop().destroy()
+    }
+    @Test fun accountSwitchClearsOldScreenAndRemovesListener() {
+        f.auth.account = a
+        val c = Robolectric.buildActivity(GuardedTestActivity::class.java).setup()
+        f.auth.change(Account("b")); drain()
+        assertRoot(shadowOf(c.get()).nextStartedActivity, Splash::class.java)
+        c.pause().stop().destroy(); assertTrue(f.auth.listeners.isEmpty())
+    }
+    @Test fun resumedScreenChecksOwnerBeforeDelayedAuthListenerNotification() {
+        f.auth.account = a; f.auth.notifyInitially = false
+        val c = Robolectric.buildActivity(GuardedTestActivity::class.java).setup()
+        c.pause().stop()
+        f.auth.account = Account("b")
+        c.start().resume()
+        assertRoot(shadowOf(c.get()).nextStartedActivity, Splash::class.java)
+        c.pause().stop().destroy()
+    }
+    @Test fun homeIgnoresProfilePhotoResultAfterActivityIsDestroyed() {
+        f.auth.account = a
+        val pending = TaskCompletionSource<UserProfile>(); f.profiles.ensureResult = pending.task
+        val c = Robolectric.buildActivity(MainActivity::class.java).setup(); drain()
+        c.pause().stop().destroy()
+        pending.setResult(UserProfile("Name", "old@example.com", "https://example.test/photo")); drain()
+        assertTrue(c.get().isDestroyed)
+    }
+    @Test fun restoredScreenCannotReusePreviousAccountsViewState() {
+        f.auth.account = a
+        val original = Robolectric.buildActivity(GuardedTestActivity::class.java).setup()
+        val saved = Bundle(); original.saveInstanceState(saved).pause().stop().destroy()
+        f.auth.change(Account("b"))
+        val c = Robolectric.buildActivity(GuardedTestActivity::class.java).create(saved).start().resume(); drain()
+        assertRoot(shadowOf(c.get()).nextStartedActivity, Splash::class.java); c.pause().stop().destroy()
+    }
+    @Test fun textOnlyProfileEditPreservesPhotoAndEmailAndWaitsForSave() {
+        f.auth.account = a
+        val pending = TaskCompletionSource<Void>(); f.profiles.updateResult = pending.task
+        val c = Robolectric.buildActivity(EditProfileActivity::class.java).setup(); drain()
+        val activity = c.get()
+        assertEquals("login@example.com", activity.findViewById<EditText>(R.id.editEmailEditText).text.toString())
+        assertFalse(activity.findViewById<EditText>(R.id.editEmailEditText).isEnabled)
+        activity.findViewById<EditText>(R.id.editDisplayNameEditText).setText("Edited")
+        activity.findViewById<Button>(R.id.saveProfileChangesButton).performClick(); drain()
+        assertEquals("a" to mapOf("displayName" to "Edited"), f.profiles.updates.single())
+        assertFalse(activity.isFinishing)
+        pending.setResult(null); drain(); assertTrue(activity.isFinishing)
+        c.pause().stop().destroy()
+    }
+    @Test fun failedProfileSaveKeepsEditorOpenAndRetryEnabled() {
+        f.auth.account = a; f.profiles.updateResult = Tasks.forException(IllegalStateException("offline"))
+        val c = Robolectric.buildActivity(EditProfileActivity::class.java).setup(); drain()
+        c.get().findViewById<EditText>(R.id.editDisplayNameEditText).setText("Draft")
+        c.get().findViewById<Button>(R.id.saveProfileChangesButton).performClick(); drain()
+        assertFalse(c.get().isFinishing)
+        assertTrue(c.get().findViewById<Button>(R.id.saveProfileChangesButton).isEnabled)
+        c.pause().stop().destroy()
+    }
+    @Test fun rotationDuringSignInDoesNotDuplicateAuthAndRoutesAfterProfileSetup() {
+        val pending = TaskCompletionSource<Account>(); f.auth.signInResult = pending.task
+        val c = Robolectric.buildActivity(Login::class.java).setup(); drain()
+        c.get().findViewById<EditText>(R.id.etEmail).setText("a@example.com")
+        c.get().findViewById<EditText>(R.id.etPassword).setText("password")
+        c.get().findViewById<Button>(R.id.btnLogin).performClick(); drain(); c.recreate(); drain()
+        assertEquals(1, f.auth.signInCalls)
+        assertFalse(c.get().findViewById<Button>(R.id.btnLogin).isEnabled)
+        pending.setResult(a); drain()
+        assertRoot(shadowOf(c.get()).nextStartedActivity, MainActivity::class.java)
+        c.pause().stop().destroy()
+    }
+    @Test fun registrationProfileFailureRetriesWithoutCreatingSecondAuthAccount() {
+        f.profiles.ensureResult = Tasks.forException(IllegalStateException("offline"))
+        val c = Robolectric.buildActivity(Registration::class.java).setup(); drain()
+        c.get().findViewById<EditText>(R.id.etUsername).setText("Chosen name")
+        c.get().findViewById<EditText>(R.id.etEmail).setText("a@example.com")
+        c.get().findViewById<EditText>(R.id.etPassword).setText("password")
+        c.get().findViewById<EditText>(R.id.etConfirmPassword).setText("password")
+        c.get().findViewById<Button>(R.id.btnRegister).performClick(); drain()
+        assertFalse(c.get().isFinishing)
+        assertEquals(AuthPhase.PROFILE_RETRY, androidx.lifecycle.ViewModelProvider(c.get(), AccountViewModelFactory(f.services))[AuthViewModel::class.java].state.value!!.phase)
+        f.profiles.ensureResult = Tasks.forResult(UserProfile())
+        c.get().findViewById<Button>(R.id.btnRegister).performClick(); drain()
+        assertEquals(1, f.auth.signInCalls)
+        assertEquals("Chosen name", f.profiles.ensures.last().second)
+        assertRoot(shadowOf(c.get()).nextStartedActivity, MainActivity::class.java)
+        c.pause().stop().destroy()
+    }
+    @Test fun passwordResetFailureKeepsActualDialogForRetryThenDismissesOnSuccess() {
+        val c = Robolectric.buildActivity(Login::class.java).setup(); drain()
+        c.get().findViewById<android.view.View>(R.id.forgotPasswordTextView).performClick(); drain()
+        val dialog = ShadowDialog.getLatestDialog()
+        dialog.findViewById<EditText>(R.id.forgotPasswordEmailEditText).setText("a@example.com")
+        f.auth.resetResult = Tasks.forException(IllegalStateException("offline"))
+        dialog.findViewById<Button>(R.id.forgotPasswordConfirmButton).performClick(); drain()
+        assertTrue(dialog.isShowing)
+        assertTrue(dialog.findViewById<Button>(R.id.forgotPasswordConfirmButton).isEnabled)
+        f.auth.resetResult = Tasks.forResult(null)
+        dialog.findViewById<Button>(R.id.forgotPasswordConfirmButton).performClick(); drain()
+        assertFalse(dialog.isShowing); c.pause().stop().destroy()
+    }
+}
diff --git a/app/src/test/java/com/example/acetimetracker/account/AccountViewModelsTest.kt b/app/src/test/java/com/example/acetimetracker/account/AccountViewModelsTest.kt
new file mode 100644
index 0000000..f7ab765
--- /dev/null
+++ b/app/src/test/java/com/example/acetimetracker/account/AccountViewModelsTest.kt
@@ -0,0 +1,148 @@
+package com.example.acetimetracker.account
+
+import android.net.Uri
+import android.os.Looper
+import com.google.android.gms.tasks.TaskCompletionSource
+import com.google.android.gms.tasks.Tasks
+import org.junit.Assert.*
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.Shadows.shadowOf
+import org.robolectric.annotation.Config
+
+@RunWith(RobolectricTestRunner::class)
+@Config(sdk = [36], manifest = Config.NONE)
+class AccountViewModelsTest {
+    private val f = FakeAccounts()
+    private val a = Account("a", "a@example.com")
+    private fun drain() = shadowOf(Looper.getMainLooper()).idle()
+
+    @Test fun signedOutStartupDoesNotReadProfiles() {
+        val vm = AuthViewModel(f.services); vm.resume(); drain()
+        assertEquals(AuthPhase.SIGNED_OUT, vm.state.value!!.phase)
+        assertTrue(f.profiles.ensures.isEmpty())
+    }
+    @Test fun latePersistedIdentityRoutesWithoutAnotherActivityStart() {
+        val vm = AuthViewModel(f.services); vm.resume(); drain()
+        f.auth.change(a); drain()
+        assertEquals(AuthPhase.READY, vm.state.value!!.phase)
+        assertEquals("a", vm.state.value!!.uid)
+    }
+    @Test fun authNotificationBeforeRegistrationCompletionDoesNotLoseChosenName() {
+        val pending = TaskCompletionSource<Account>(); f.auth.signInResult = pending.task
+        val vm = AuthViewModel(f.services); vm.register("Chosen", "a@example.com", "password", "password")
+        f.auth.change(a); drain()
+        assertTrue(f.profiles.ensures.isEmpty())
+        pending.setResult(a); drain()
+        assertEquals(listOf("a" to "Chosen"), f.profiles.ensures)
+        assertEquals(AuthPhase.READY, vm.state.value!!.phase)
+    }
+    @Test fun sameAccountNotificationDoesNotAutoRetryFailedProfile() {
+        f.auth.account = a; f.profiles.ensureResult = Tasks.forException(IllegalStateException("offline"))
+        val vm = AuthViewModel(f.services); vm.resume(); drain()
+        val attempts = f.profiles.ensures.size
+        f.auth.change(a); drain()
+        assertEquals(attempts, f.profiles.ensures.size)
+        assertEquals(AuthPhase.PROFILE_RETRY, vm.state.value!!.phase)
+    }
+    @Test fun identityRestoredDuringPasswordResetIsReconciledWhenResetCompletes() {
+        val pending = TaskCompletionSource<Void>(); f.auth.resetResult = pending.task
+        val vm = AuthViewModel(f.services); vm.resetPassword("a@example.com")
+        f.auth.change(a); drain(); assertTrue(f.profiles.ensures.isEmpty())
+        pending.setResult(null); drain()
+        assertEquals(AuthPhase.READY, vm.state.value!!.phase)
+        assertEquals("a", vm.state.value!!.uid)
+    }
+    @Test fun identityRestoredDuringFailedSignInIsReconciledAfterFailure() {
+        val pending = TaskCompletionSource<Account>(); f.auth.signInResult = pending.task
+        val vm = AuthViewModel(f.services); vm.signIn("other@example.com", "password")
+        f.auth.change(a); drain(); assertTrue(f.profiles.ensures.isEmpty())
+        pending.setException(IllegalStateException("failed sign-in")); drain()
+        assertEquals(AuthPhase.READY, vm.state.value!!.phase)
+        assertEquals("a", vm.state.value!!.uid)
+    }
+    @Test fun authListenerIsRemovedWhenViewModelIsCleared() {
+        val vm = AuthViewModel(f.services)
+        assertEquals(1, f.auth.listeners.size)
+        val store = androidx.lifecycle.ViewModelStore(); store.put("auth", vm); store.clear()
+        assertTrue(f.auth.listeners.isEmpty())
+        f.auth.change(a); drain(); assertTrue(f.profiles.ensures.isEmpty())
+    }
+    @Test fun signedInStartupInitializesBeforeRouting() {
+        f.auth.account = a
+        val pending = TaskCompletionSource<UserProfile>(); f.profiles.ensureResult = pending.task
+        val vm = AuthViewModel(f.services); vm.resume(); drain()
+        assertEquals(AuthPhase.WORKING, vm.state.value!!.phase)
+        pending.setResult(UserProfile()); drain()
+        assertEquals(AuthPhase.READY, vm.state.value!!.phase)
+        assertEquals("a", vm.state.value!!.uid)
+    }
+    @Test fun registrationInitializesChosenNameAndDoesNotRecreateAccountOnProfileRetry() {
+        f.profiles.ensureResult = Tasks.forException(IllegalStateException("offline"))
+        val vm = AuthViewModel(f.services); vm.register(" Name ", "a@example.com", "password", "password"); drain()
+        assertEquals(AuthPhase.PROFILE_RETRY, vm.state.value!!.phase)
+        assertEquals("a", f.auth.current!!.uid)
+        f.profiles.ensureResult = Tasks.forResult(UserProfile()); vm.resume(); drain()
+        assertEquals(1, f.auth.signInCalls)
+        assertEquals("Name", f.profiles.ensures.last().second)
+        assertEquals(AuthPhase.READY, vm.state.value!!.phase)
+    }
+    @Test fun duplicateSignInWhileBusyDoesNotIssueAnotherRequest() {
+        f.auth.signInResult = TaskCompletionSource<Account>().task
+        val vm = AuthViewModel(f.services); vm.signIn("a@example.com", "password"); vm.signIn("a@example.com", "password")
+        assertEquals(1, f.auth.signInCalls)
+    }
+    @Test fun failedSignInDoesNotReadOrInitializeProfile() {
+        f.auth.signInResult = Tasks.forException(IllegalStateException("invalid"))
+        val vm = AuthViewModel(f.services); vm.signIn("a@example.com", "password"); drain()
+        assertEquals(AuthPhase.ERROR, vm.state.value!!.phase)
+        assertTrue(f.profiles.ensures.isEmpty())
+    }
+    @Test fun profileCompletionAfterSignOutCannotRouteOldAccount() {
+        f.auth.account = a
+        val pending = TaskCompletionSource<UserProfile>(); f.profiles.ensureResult = pending.task
+        val vm = AuthViewModel(f.services); vm.resume(); vm.useDifferentAccount(); pending.setResult(UserProfile()); drain()
+        assertEquals(AuthPhase.SIGNED_OUT, vm.state.value!!.phase)
+        assertNull(f.auth.current)
+    }
+    @Test fun resetFailureCanBeRetriedAndSuccessIsReported() {
+        val vm = AuthViewModel(f.services)
+        f.auth.resetResult = Tasks.forException(IllegalStateException("offline")); vm.resetPassword("a@example.com"); drain()
+        assertEquals(AuthPhase.ERROR, vm.state.value!!.phase)
+        f.auth.resetResult = Tasks.forResult(null); vm.resetPassword("a@example.com"); drain()
+        assertEquals(AuthPhase.RESET_SENT, vm.state.value!!.phase)
+    }
+    @Test fun textOnlyEditRetainsPhotoAndEmailAndWaitsForAcknowledgment() {
+        f.auth.account = a
+        val pending = TaskCompletionSource<Void>(); f.profiles.updateResult = pending.task
+        val vm = ProfileViewModel(f.services); vm.load(a); drain(); vm.editName(" Changed "); vm.save(); drain()
+        assertEquals("a" to mapOf("displayName" to "Changed"), f.profiles.updates.single())
+        assertFalse(vm.state.value!!.saved)
+        assertTrue(vm.state.value!!.saving)
+        pending.setResult(null); drain(); assertTrue(vm.state.value!!.saved)
+    }
+    @Test fun failedSaveKeepsDraftEditable() {
+        f.auth.account = a; f.profiles.updateResult = Tasks.forException(IllegalStateException("offline"))
+        val vm = ProfileViewModel(f.services); vm.load(a); drain(); vm.editName("Draft"); vm.save(); drain()
+        assertEquals("Draft", vm.state.value!!.name)
+        assertFalse(vm.state.value!!.saving); assertFalse(vm.state.value!!.saved)
+        assertEquals(AccountProblem.PROFILE_SAVE, vm.state.value!!.problem)
+    }
+    @Test fun failedPhotoUploadKeepsExistingPhotoAndReenablesSaving() {
+        f.auth.account = a; f.photos.result = Tasks.forException(IllegalStateException("download URL failed"))
+        val vm = ProfileViewModel(f.services); vm.load(a); drain(); vm.upload(Uri.parse("content://photo")); drain()
+        assertFalse(vm.state.value!!.uploading)
+        assertEquals("old-photo", vm.state.value!!.photo)
+        vm.editName("Changed"); vm.save(); drain()
+        assertFalse(f.profiles.updates.single().second.containsKey("profilePictureUrl"))
+    }
+    @Test fun staleUploadAfterAccountSwitchCannotModifyNewAccount() {
+        f.auth.account = a
+        val pending = TaskCompletionSource<String>(); f.photos.result = pending.task
+        val vm = ProfileViewModel(f.services); vm.load(a); drain(); vm.upload(Uri.parse("content://photo"))
+        f.auth.change(Account("b", "b@example.com")); pending.setResult("a-photo"); drain(); vm.save(); drain()
+        assertFalse(vm.state.value!!.saved)
+        assertTrue(f.profiles.updates.isEmpty())
+    }
+}
diff --git a/app/src/test/java/com/example/acetimetracker/account/FakeAccounts.kt b/app/src/test/java/com/example/acetimetracker/account/FakeAccounts.kt
new file mode 100644
index 0000000..efd88f9
--- /dev/null
+++ b/app/src/test/java/com/example/acetimetracker/account/FakeAccounts.kt
@@ -0,0 +1,40 @@
+package com.example.acetimetracker.account
+
+import android.net.Uri
+import com.google.android.gms.tasks.Task
+import com.google.android.gms.tasks.TaskCompletionSource
+import com.google.android.gms.tasks.Tasks
+
+class FakeAuth : AccountAuth {
+    var account: Account? = null
+    override val current get() = account
+    var signInResult: Task<Account> = Tasks.forResult(Account("a", "a@example.com"))
+    var resetResult: Task<Void> = Tasks.forResult(null)
+    var notifyInitially = true
+    var signInCalls = 0
+    val listeners = mutableListOf<(Account?) -> Unit>()
+    override fun signIn(email: String, password: String): Task<Account> { signInCalls++; return signInResult.onSuccessTask { change(it); Tasks.forResult(it) } }
+    override fun register(email: String, password: String) = signIn(email, password)
+    override fun resetPassword(email: String) = resetResult
+    override fun signOut() { change(null) }
+    override fun observe(listener: (Account?) -> Unit): () -> Unit { listeners.add(listener); if (notifyInitially) listener(current); return { listeners.remove(listener) } }
+    fun change(value: Account?) { account = value; listeners.toList().forEach { it(value) } }
+}
+class FakeProfiles : Profiles {
+    var ensureResult: Task<UserProfile> = Tasks.forResult(UserProfile("Existing", "legacy@example.com", "old-photo"))
+    var updateResult: Task<Void> = Tasks.forResult(null)
+    val ensures = mutableListOf<Pair<String, String?>>()
+    val updates = mutableListOf<Pair<String, Map<String, String>>>()
+    override fun ensure(account: Account, preferredName: String?): Task<UserProfile> { ensures.add(account.uid to preferredName); return ensureResult }
+    override fun update(uid: String, fields: Map<String, String>): Task<Void> { updates.add(uid to fields); return updateResult }
+}
+class FakePhotos : ProfilePhotos {
+    var result: Task<String> = Tasks.forResult("new-photo")
+    override fun upload(uid: String, uri: Uri) = result
+}
+class FakeAccounts {
+    val auth = FakeAuth()
+    val profiles = FakeProfiles()
+    val photos = FakePhotos()
+    val services = AccountServices(auth, profiles, photos)
+}
diff --git a/app/src/test/java/com/example/acetimetracker/account/ProfileFieldsTest.kt b/app/src/test/java/com/example/acetimetracker/account/ProfileFieldsTest.kt
new file mode 100644
index 0000000..452e614
--- /dev/null
+++ b/app/src/test/java/com/example/acetimetracker/account/ProfileFieldsTest.kt
@@ -0,0 +1,36 @@
+package com.example.acetimetracker.account
+
+import org.junit.Assert.*
+import org.junit.Test
+
+class ProfileFieldsTest {
+    private val account = Account("user-a", "login@example.com", "Auth name", "auth-photo")
+
+    @Test fun createsProfileFromAuthenticatedIdentity() {
+        assertEquals(mapOf("displayName" to "Chosen name", "email" to "login@example.com", "profilePictureUrl" to "auth-photo"),
+            ProfileFields.missing(emptyMap(), account, " Chosen name "))
+    }
+
+    @Test fun preservesExistingProfileAndHistory() {
+        val existing = mapOf<String, Any?>("displayName" to "Existing", "email" to "legacy@example.com",
+            "profilePictureUrl" to "old-photo", "dailyTimesheetEntries" to listOf(mapOf("totalHours" to 2.5)),
+            "minGoal" to 4.0, "custom" to "keep")
+        assertTrue(ProfileFields.missing(existing, account, "New name").isEmpty())
+        assertEquals("legacy@example.com", existing["email"])
+    }
+
+    @Test fun fillsOnlyAbsentFieldsAndIsIdempotent() {
+        val existing = mapOf<String, Any?>("displayName" to "", "profilePictureUrl" to null, "dailyTimesheetEntries" to listOf(1))
+        val patch = ProfileFields.missing(existing, account)
+        assertEquals(mapOf("email" to "login@example.com"), patch)
+        assertTrue(ProfileFields.missing(existing + patch, account).isEmpty())
+    }
+
+    @Test fun textOnlyEditDoesNotRewriteEmailPhotoOrHistory() {
+        assertEquals(mapOf("displayName" to "Edited"), ProfileFields.edit(" Edited ", null))
+    }
+
+    @Test fun photoChangesAreExplicit() {
+        assertEquals(mapOf("displayName" to "Edited", "profilePictureUrl" to "new-photo"), ProfileFields.edit("Edited", "new-photo"))
+    }
+}
diff --git a/docs/development.md b/docs/development.md
index 0fcb785..a5856d1 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -79,9 +79,17 @@ AndroidX drawer/Back dispatcher on API 36, covering drawer dismissal and default
 Back navigation without initializing Firebase clients. The first run downloads
 Robolectric's Android runtime from Maven Central.
 
-The suite does not claim timer, overnight date handling, migration, or account
-isolation correctness; those require behavior changes and tests in their owning
-stages.
+P2 also uses fake account/profile/photo gateways injected through `AceApplication`
+to exercise the real login, registration, profile editor, and routing screens.
+It covers session changes, restored owners, task-clearing navigation, registration
+setup retry, rotation during in-flight work, password-reset dialog retries,
+text-only edits, save acknowledgment, and failed uploads. Pure profile-field tests
+check that legacy arrays, custom fields, email, and old photo references survive.
+Only the decorative native splash GIF is substituted in Robolectric.
+
+These tests never initialize Firebase clients or contact a backend. They do not
+claim deployed-rules or server integration correctness. Timer totals, overnight
+date handling, and historical migration remain deferred to their owning stages.
 
 The obsolete manifest entry for the absent `timetracker` activity was removed,
 the drawer uses `OnBackPressedDispatcher` for API 36 gestures, and the GIF library
@@ -92,3 +100,38 @@ or device (`./gradlew :app:connectedDebugAndroidTest`); compilation alone does n
 count as an on-device test run. Target-SDK behavior, edge-to-edge layouts, storage
 permissions, accessibility, and the deferred functional defects need device
 verification before release. iOS remains deferred.
+
+## Account and profile behavior (P2)
+
+Startup checks the persisted Auth session immediately and listens for delayed
+Auth initialization. Signed-out users see login;
+signed-in users initialize their root profile before going home. Auth success
+followed by profile failure offers retry against the same UID, without creating a
+second account. Account screens capture their owner UID, reject stale saved state,
+and return through a task-clearing entry route on sign-out or account switch.
+
+`users/{uid}` keeps its existing schema. Profile bootstrap uses a transaction and
+merge to add only absent `displayName`, `email`, and `profilePictureUrl` fields.
+Existing values (including blank/null values), summaries, and unrelated fields are
+preserved. An existing cached document can open offline if the transaction fails;
+a missing profile exposes retry. Text-only edits merge only `displayName`, and an
+explicit successful photo selection adds `profilePictureUrl`. Saves finish only
+after the write task succeeds; failures retain the draft. No sign-in email editing
+is offered: the displayed read-only email comes from Auth, while the legacy
+Firestore email stays intact.
+
+Profile uploads use `profile_pictures/{uid}/{uuid}` with `ownerUid` metadata.
+Existing URLs and objects are retained; no cleanup or migration is performed.
+Upload and download-URL failures share a retryable UI state. ViewModels retain
+in-flight work across configuration changes and callbacks check their owner UID.
+Passwords are not retained in saved view state. Process death can discard unsaved
+editor drafts and the preferred registration name before bootstrap is acknowledged;
+the next launch retries setup from the surviving Auth identity.
+
+Before production rollout, use an isolated development project/emulator and a
+device to verify registration, persisted startup, offline cache/reconnect, denied
+Firestore writes, upload/download failures, account switching, and rotation. Check
+that the deployed Storage rules permit the UID-scoped upload path for its owner
+and deny other users. Production rules were not read or deployed by this work.
+No commands here modify existing Firebase data. Debug CI stays on demo config.
+iOS remains deferred.
diff --git a/docs/superpowers/plans/2026-10-19-android-auth-profile.md b/docs/superpowers/plans/2026-10-19-android-auth-profile.md
new file mode 100644
index 0000000..f953cb3
--- /dev/null
+++ b/docs/superpowers/plans/2026-10-19-android-auth-profile.md
@@ -0,0 +1,34 @@
+# P2: authentication, profiles, and session routing
+
+Build on merged P1. Keep the current Views and Firebase paths. iOS, historical
+migration, rules deployment, and production Firebase operations remain out of scope.
+
+- [x] Add account/profile gateways and a small application dependency container.
+  Initialize only missing profile fields in a transaction; preserve all existing
+  fields, arrays, category documents, and image references. Cached existing
+  profiles may open offline; incomplete setup exposes retry without recreating Auth.
+- [x] Retain asynchronous auth/profile work in ViewModels, gate duplicate actions,
+  and reject stale results after account changes. Do not persist passwords.
+- [x] Route startup and successful authentication to the correct destination;
+  clear the task on sign-out and guard account screens, including restored state.
+- [x] Fix text-only profile edits and retain existing images. Save only intentional
+  profile changes; sign-in email is read-only and sourced from Auth. Keep failed
+  saves editable and expose upload/download failures without blocking Back.
+- [x] Test preservation, failures/retries, stale callbacks, routing/back-stack
+  flags, text-only saving and rotation with fake gateways and real UI components.
+- [x] Run full metadata/build/test/lint checks, obtain review, open a separate P2
+  PR, and submit hosted CI checks. Do not merge P2 without a later request.
+
+Validation uses demo configuration and in-memory gateway fixtures, never live
+accounts/data. Firebase adapter integration and deployed upload rules remain
+explicit staging/device checks before production rollout.
+
+Local validation: metadata check, debug APK, instrumentation APK compilation,
+46 JVM/Robolectric tests, and lint passed. Lint has zero errors and 192 warnings.
+Independent review found a destroyed-Activity callback and a delayed-listener
+resume edge case; both now have failing-before/passing-after regression tests,
+and follow-up review found no remaining actionable issues. Late restored identity
+is also observed across authentication/reset completion; regressions cover retry
+gating, chosen-name ordering, and listener cleanup. Hosted CI passed the first
+revision; the final revision's status and logs are tracked on
+[PR #3](https://github.com/MphoCodes/AceTimeTracker/pull/3).
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0290720..f3fbdae 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,8 +15,11 @@ junit = "4.13.2"
 androidx-test-junit = "1.3.0"
 espresso = "3.7.0"
 robolectric = "4.17"
+lifecycle = "2.11.0"
 
 [libraries]
+androidx-lifecycle-livedata = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycle" }
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "core" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }