diff --git a/app/src/main/java/deakin/gopher/guardian/services/NavigationService.kt b/app/src/main/java/deakin/gopher/guardian/services/NavigationService.kt
index 255c2e34f..383e056ce 100644
--- a/app/src/main/java/deakin/gopher/guardian/services/NavigationService.kt
+++ b/app/src/main/java/deakin/gopher/guardian/services/NavigationService.kt
@@ -16,40 +16,21 @@ import deakin.gopher.guardian.view.general.TasksListActivity
 
 class NavigationService(val activity: Activity) {
     fun toHomeScreenForRole(role: Role) {
-        when (role) {
-            Role.Caretaker -> {
-                activity.startActivity(
-                    Intent(
-                        activity.applicationContext,
-                        Homepage4caretaker::class.java,
-                    ),
-                )
-            }
-
-            Role.Nurse -> {
-                activity.startActivity(
-                    Intent(
-                        activity.applicationContext,
-                        Homepage4nurse::class.java,
-                    ),
-                )
-            }
-
-            Role.Admin -> {
-                activity.startActivity(
-                    Intent(
-                        activity.applicationContext,
-                        Homepage4admin::class.java,
-                    ),
-                )
-            }
+        val intent = when (role) {
+            Role.Caretaker -> Intent(activity, Homepage4caretaker::class.java)
+            Role.Nurse -> Intent(activity, Homepage4nurse::class.java)
+            Role.Admin -> Intent(activity, Homepage4admin::class.java)
         }
+        // Clear back stack so user cannot go back to Login/PIN screens
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        activity.startActivity(intent)
+        activity.finish()
     }
 
     fun toRegistration() {
         activity.startActivity(
             Intent(
-                activity.applicationContext,
+                activity,
                 RegisterActivity::class.java,
             ),
         )
@@ -58,25 +39,23 @@ class NavigationService(val activity: Activity) {
     fun onSettings() {
         activity.startActivity(
             Intent(
-                activity.applicationContext,
+                activity,
                 Setting::class.java,
             ),
         )
     }
 
     fun onSignOut() {
-        activity.startActivity(
-            Intent(
-                activity.applicationContext,
-                LoginActivity::class.java,
-            ),
-        )
+        val intent = Intent(activity, LoginActivity::class.java)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+        activity.startActivity(intent)
+        activity.finish()
     }
 
     fun onLaunchPatientList() {
         activity.startActivity(
             Intent(
-                activity.applicationContext,
+                activity,
                 PatientListActivity::class.java,
             ),
         )
@@ -85,7 +64,7 @@ class NavigationService(val activity: Activity) {
     fun onLaunchTasks() {
         activity.startActivity(
             Intent(
-                activity.applicationContext,
+                activity,
                 TasksListActivity::class.java,
             ),
         )
@@ -94,24 +73,26 @@ class NavigationService(val activity: Activity) {
     fun onLaunchTaskCreator() {
         activity.startActivity(
             Intent(
-                activity.applicationContext,
+                activity,
                 TaskAddActivity::class.java,
             ),
         )
     }
 
     fun toLogin() {
-        activity.startActivity(
-            Intent(
-                activity.applicationContext,
-                LoginActivity::class.java,
-            ),
-        )
+        val intent = Intent(activity, LoginActivity::class.java)
+        // If coming from Registration, we want to clear the Registration screen from stack
+        intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
+        activity.startActivity(intent)
+        activity.finish()
     }
 
     fun toPinCodeActivity(role: Role) {
-        val intent = Intent(activity.applicationContext, PinCodeActivity::class.java)
+        val intent = Intent(activity, PinCodeActivity::class.java)
         intent.putExtra("role", role)
         activity.startActivity(intent)
+        // We keep LoginActivity in the stack in case user wants to go back from PIN screen?
+        // Actually, usually you'd want to finish() it too if PIN is mandatory.
+        // If we want the back button on PIN screen to go back to Login, we don't finish() here.
     }
 }
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/LoginActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/LoginActivity.kt
index c03d645d6..660de7c99 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/LoginActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/LoginActivity.kt
@@ -10,6 +10,7 @@ import android.widget.ProgressBar
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
+import androidx.core.widget.addTextChangedListener
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
@@ -17,6 +18,7 @@ import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.common.SignInButton
 import com.google.android.gms.common.api.ApiException
 import com.google.android.gms.tasks.Task
+import com.google.android.material.textfield.TextInputLayout
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.GoogleAuthProvider
 import com.google.gson.Gson
@@ -44,6 +46,8 @@ class LoginActivity : BaseActivity() {
         setContentView(R.layout.activity_login)
         val mEmail: EditText = findViewById(R.id.Email)
         val mPassword: EditText = findViewById(R.id.password)
+        val emailLayout: TextInputLayout = findViewById(R.id.emailTextInputLayout)
+        val passwordLayout: TextInputLayout = findViewById(R.id.passwordTextInputLayout)
         val progressBar: ProgressBar = findViewById(R.id.progressBar)
         val loginButton: Button = findViewById(R.id.loginBtn)
         val loginGoogleButton: SignInButton = findViewById(R.id.loginGoogleBtn)
@@ -56,23 +60,30 @@ class LoginActivity : BaseActivity() {
                 .build()
         gsoClient = GoogleSignIn.getClient(this, gso)
 
+        mEmail.addTextChangedListener { emailLayout.error = null }
+        mPassword.addTextChangedListener { passwordLayout.error = null }
+
         loginButton.setOnClickListener {
-            progressBar.show()
             val emailInput = mEmail.text.toString().trim { it <= ' ' }
             val passwordInput = mPassword.text.toString().trim { it <= ' ' }
 
-            val loginValidationError = validateInputs(emailInput)
+            val loginValidationError = validateInputs(emailInput, passwordInput)
 
             if (loginValidationError != null) {
-                progressBar.hide()
-                Toast.makeText(
-                    applicationContext,
-                    loginValidationError.messageResoureId,
-                    Toast.LENGTH_LONG,
-                ).show()
+                when (loginValidationError) {
+                    LoginValidationError.EmptyEmail, LoginValidationError.InvalidEmail -> {
+                        emailLayout.error = getString(loginValidationError.messageResoureId)
+                    }
+                    LoginValidationError.EmptyPassword -> {
+                        passwordLayout.error = getString(loginValidationError.messageResoureId)
+                    }
+                    else -> showMessage(getString(loginValidationError.messageResoureId))
+                }
                 return@setOnClickListener
             }
 
+            setLoading(true, loginButton, progressBar)
+
             val call = ApiClient.apiService.login(emailInput, passwordInput)
 
             call.enqueue(
@@ -81,21 +92,15 @@ class LoginActivity : BaseActivity() {
                         call: Call<AuthResponse>,
                         response: Response<AuthResponse>,
                     ) {
-                        progressBar.hide()
+                        setLoading(false, loginButton, progressBar)
                         if (response.isSuccessful && response.body() != null) {
-                            // Handle successful login
                             val user = response.body()!!.user
                             val token = response.body()!!.token
                             SessionManager.createLoginSession(user, token)
                             NavigationService(this@LoginActivity).toPinCodeActivity(user.role)
                         } else {
-                            // Handle error
-                            val errorResponse =
-                                Gson().fromJson(
-                                    response.errorBody()?.string(),
-                                    ApiErrorResponse::class.java,
-                                )
-                            showMessage(errorResponse.apiError ?: response.message())
+                            val errorResponse = parseError(response)
+                            showMessage(errorResponse ?: response.message())
                         }
                     }
 
@@ -103,9 +108,8 @@ class LoginActivity : BaseActivity() {
                         call: Call<AuthResponse>,
                         t: Throwable,
                     ) {
-                        // Handle failure
-                        progressBar.hide()
-                        showMessage(getString(R.string.toast_login_error, t.message))
+                        setLoading(false, loginButton, progressBar)
+                        showMessage(getString(R.string.toast_login_error, t.localizedMessage))
                     }
                 },
             )
@@ -143,7 +147,29 @@ class LoginActivity : BaseActivity() {
         }
     }
 
-    private fun validateInputs(rawEmail: String?): LoginValidationError? {
+    private fun setLoading(isLoading: Boolean, button: Button, progressBar: ProgressBar) {
+        if (isLoading) {
+            button.isEnabled = false
+            progressBar.show()
+        } else {
+            button.isEnabled = true
+            progressBar.hide()
+        }
+    }
+
+    private fun parseError(response: Response<*>): String? {
+        return try {
+            val errorResponse = Gson().fromJson(
+                response.errorBody()?.string(),
+                ApiErrorResponse::class.java,
+            )
+            errorResponse.apiError
+        } catch (e: Exception) {
+            null
+        }
+    }
+
+    private fun validateInputs(rawEmail: String?, rawPassword: String?): LoginValidationError? {
         if (rawEmail.isNullOrEmpty()) {
             return LoginValidationError.EmptyEmail
         }
@@ -153,6 +179,10 @@ class LoginActivity : BaseActivity() {
             return LoginValidationError.InvalidEmail
         }
 
+        if (rawPassword.isNullOrEmpty()) {
+            return LoginValidationError.EmptyPassword
+        }
+
         return null
     }
 
@@ -170,13 +200,8 @@ class LoginActivity : BaseActivity() {
                                 ?: getString(R.string.toast_reset_link_sent_to_your_email),
                         )
                     } else {
-                        // Handle error
-                        val errorResponse =
-                            Gson().fromJson(
-                                response.errorBody()?.string(),
-                                ApiErrorResponse::class.java,
-                            )
-                        showMessage(errorResponse.apiError ?: response.message())
+                        val errorResponse = parseError(response)
+                        showMessage(errorResponse ?: response.message())
                     }
                 }
 
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt
index 2659b6c0e..3a0678274 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/PinCodeActivity.kt
@@ -1,8 +1,13 @@
 package deakin.gopher.guardian.view.general
 
+import android.content.Context
 import android.os.Bundle
 import android.os.CountDownTimer
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.KeyEvent
 import android.view.View
+import android.view.inputmethod.InputMethodManager
 import android.widget.Button
 import android.widget.EditText
 import android.widget.ProgressBar
@@ -10,6 +15,7 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.LinearLayoutCompat
+import androidx.core.view.isVisible
 import com.google.gson.Gson
 import deakin.gopher.guardian.R
 import deakin.gopher.guardian.model.ApiErrorResponse
@@ -18,7 +24,6 @@ import deakin.gopher.guardian.model.login.Role
 import deakin.gopher.guardian.model.login.SessionManager
 import deakin.gopher.guardian.services.NavigationService
 import deakin.gopher.guardian.services.api.ApiClient
-import deakin.gopher.guardian.view.hide
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -28,34 +33,36 @@ class PinCodeActivity : AppCompatActivity() {
     private val userEmail = SessionManager.getCurrentUser().email
 
     private lateinit var progressBar: ProgressBar
+    private lateinit var submitButton: Button
+    private lateinit var resendButton: Button
+    private lateinit var pinDigits: List<EditText>
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.login_enter_pin)
         userRole = intent.getSerializableExtra("role") as Role
 
-        val pinDigit1 = findViewById<EditText>(R.id.pin_digit_1)
-        val pinDigit2 = findViewById<EditText>(R.id.pin_digit_2)
-        val pinDigit3 = findViewById<EditText>(R.id.pin_digit_3)
-        val pinDigit4 = findViewById<EditText>(R.id.pin_digit_4)
-        val pinDigit5 = findViewById<EditText>(R.id.pin_digit_5)
-        val pinDigit6 = findViewById<EditText>(R.id.pin_digit_6)
-        val submitButton = findViewById<Button>(R.id.loginBtn)
-        val resendButton = findViewById<Button>(R.id.resendText)
-        progressBar = findViewById<ProgressBar>(R.id.progressBar)
+        pinDigits = listOf(
+            findViewById(R.id.pin_digit_1),
+            findViewById(R.id.pin_digit_2),
+            findViewById(R.id.pin_digit_3),
+            findViewById(R.id.pin_digit_4),
+            findViewById(R.id.pin_digit_5),
+            findViewById(R.id.pin_digit_6)
+        )
+        
+        submitButton = findViewById(R.id.loginBtn)
+        resendButton = findViewById(R.id.resendText)
+        progressBar = findViewById(R.id.progressBar)
+
+        setupPinInputs()
 
         submitButton.setOnClickListener {
-            val pin =
-                pinDigit1.text.toString() +
-                    pinDigit2.text.toString() +
-                    pinDigit3.text.toString() +
-                    pinDigit4.text.toString() +
-                    pinDigit5.text.toString() +
-                    pinDigit6.text.toString()
+            val pin = pinDigits.joinToString("") { it.text.toString() }
             if (pin.length == 6) {
                 validatePin(pin)
             } else {
-                showMessage("Please enter a 6-digit PIN")
+                showMessage(getString(R.string.error_enter_6_digit_pin))
             }
         }
 
@@ -63,10 +70,53 @@ class PinCodeActivity : AppCompatActivity() {
             sendPin()
             startResendCooldown()
         }
-        resendButton.performClick()
+        
+        // Initial PIN request
+        sendPin()
+        startResendCooldown()
+        
+        // Focus first digit and show keyboard
+        pinDigits[0].postDelayed({
+            pinDigits[0].requestFocus()
+            showKeyboard(pinDigits[0])
+        }, 300)
+    }
+
+    private fun setupPinInputs() {
+        for (i in pinDigits.indices) {
+            pinDigits[i].addTextChangedListener(object : TextWatcher {
+                override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+                override fun afterTextChanged(s: Editable?) {
+                    if (s?.length == 1) {
+                        if (i < pinDigits.size - 1) {
+                            pinDigits[i + 1].requestFocus()
+                        }
+                    }
+                    updateSubmitButtonState()
+                }
+            })
+
+            pinDigits[i].setOnKeyListener { _, keyCode, event ->
+                if (keyCode == KeyEvent.KEYCODE_DEL && event.action == KeyEvent.ACTION_DOWN) {
+                    if (pinDigits[i].text.isEmpty() && i > 0) {
+                        pinDigits[i - 1].requestFocus()
+                        pinDigits[i - 1].text.clear()
+                        return@setOnKeyListener true
+                    }
+                }
+                false
+            }
+        }
+    }
+
+    private fun updateSubmitButtonState() {
+        val isComplete = pinDigits.all { it.text.length == 1 }
+        submitButton.isEnabled = isComplete
     }
 
     private fun sendPin() {
+        setLoading(true)
         val call = ApiClient.apiService.sendPin(userEmail)
         call.enqueue(
             object : Callback<BaseModel> {
@@ -74,41 +124,25 @@ class PinCodeActivity : AppCompatActivity() {
                     call: Call<BaseModel>,
                     response: Response<BaseModel>,
                 ) {
-                    progressBar.hide()
+                    setLoading(false)
                     if (response.isSuccessful && response.body() != null) {
-                        showMessage(response.body()!!.apiMessage ?: "Pin sent tou your email")
+                        showMessage(response.body()!!.apiMessage ?: getString(R.string.toast_pin_sent))
                     } else {
-                        // Handle error
-                        val errorResponse =
-                            Gson().fromJson(
-                                response.errorBody()?.string(),
-                                ApiErrorResponse::class.java,
-                            )
-                        showMessage(errorResponse.apiError ?: response.message())
+                        val errorResponse = parseError(response)
+                        showMessage(errorResponse ?: response.message())
                     }
                 }
 
-                override fun onFailure(
-                    call: Call<BaseModel>,
-                    t: Throwable,
-                ) {
-                    // Handle failure
-                    progressBar.hide()
-                    showMessage("Error sending PIN: ${t.message}")
+                override fun onFailure(call: Call<BaseModel>, t: Throwable) {
+                    setLoading(false)
+                    showMessage(getString(R.string.error_sending_pin, t.localizedMessage))
                 }
             },
         )
     }
 
     private fun validatePin(pin: String) {
-        // Dummy pass for pin: 000000
-        if (pin.equals("000000")) {
-            showMessage("Pin verified successfully")
-            NavigationService(this@PinCodeActivity).toHomeScreenForRole(userRole)
-            finish()
-            return
-        }
-
+        setLoading(true)
         val call = ApiClient.apiService.verifyPin(userEmail, pin)
         call.enqueue(
             object : Callback<BaseModel> {
@@ -116,34 +150,65 @@ class PinCodeActivity : AppCompatActivity() {
                     call: Call<BaseModel>,
                     response: Response<BaseModel>,
                 ) {
-                    progressBar.hide()
+                    setLoading(false)
                     if (response.isSuccessful && response.body() != null) {
-                        showMessage(response.body()!!.apiMessage ?: "Pin verified successfully")
+                        showMessage(response.body()!!.apiMessage ?: getString(R.string.toast_pin_verified))
                         NavigationService(this@PinCodeActivity).toHomeScreenForRole(userRole)
                         finish()
                     } else {
-                        // Handle error
-                        val errorResponse =
-                            Gson().fromJson(
-                                response.errorBody()?.string(),
-                                ApiErrorResponse::class.java,
-                            )
-                        showMessage(errorResponse.apiError ?: response.message())
+                        val errorResponse = parseError(response)
+                        showMessage(errorResponse ?: response.message())
+                        clearPin()
                     }
                 }
 
-                override fun onFailure(
-                    call: Call<BaseModel>,
-                    t: Throwable,
-                ) {
-                    // Handle failure
-                    progressBar.hide()
-                    showMessage("Error validating PIN: ${t.message}")
+                override fun onFailure(call: Call<BaseModel>, t: Throwable) {
+                    setLoading(false)
+                    showMessage(getString(R.string.error_validating_pin, t.localizedMessage))
                 }
             },
         )
     }
 
+    private fun clearPin() {
+        pinDigits.forEach { it.text.clear() }
+        pinDigits[0].requestFocus()
+    }
+
+    private fun setLoading(isLoading: Boolean) {
+        progressBar.isVisible = isLoading
+        submitButton.isEnabled = !isLoading && pinDigits.all { it.text.length == 1 }
+        pinDigits.forEach { it.isEnabled = !isLoading }
+        if (isLoading) {
+            hideKeyboard()
+        }
+    }
+
+    private fun showKeyboard(view: View) {
+        val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT)
+    }
+
+    private fun hideKeyboard() {
+        val view = this.currentFocus
+        if (view != null) {
+            val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+            imm.hideSoftInputFromWindow(view.windowToken, 0)
+        }
+    }
+
+    private fun parseError(response: Response<*>): String? {
+        return try {
+            val errorResponse = Gson().fromJson(
+                response.errorBody()?.string(),
+                ApiErrorResponse::class.java,
+            )
+            errorResponse.apiError
+        } catch (e: Exception) {
+            null
+        }
+    }
+
     private fun showMessage(message: String) {
         Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
     }
@@ -151,30 +216,25 @@ class PinCodeActivity : AppCompatActivity() {
     private fun startResendCooldown() {
         val countdownTimerContainer = findViewById<LinearLayoutCompat>(R.id.containerCountdown)
         val countdownTimer = findViewById<TextView>(R.id.countdownTimer)
-        val resendButton = findViewById<Button>(R.id.resendText)
 
-        // Disable the resend button
         resendButton.isEnabled = false
-        resendButton.setTextColor(resources.getColor(R.color.gray2))
+        resendButton.alpha = 0.5f
         countdownTimerContainer.visibility = View.VISIBLE
 
-        // Countdown for 1 minute 30 seconds (90,000ms)
         object : CountDownTimer(90000, 1000) {
             override fun onTick(millisUntilFinished: Long) {
                 val secondsLeft = millisUntilFinished / 1000
-                val countdownText =
-                    resources.getQuantityString(
-                        R.plurals.resend_countdown_seconds,
-                        secondsLeft.toInt(),
-                        secondsLeft,
-                    )
+                val countdownText = resources.getQuantityString(
+                    R.plurals.resend_countdown_seconds,
+                    secondsLeft.toInt(),
+                    secondsLeft
+                )
                 countdownTimer.text = countdownText
             }
 
             override fun onFinish() {
-                // Enable the resend button
                 resendButton.isEnabled = true
-                resendButton.setTextColor(resources.getColor(R.color.TG_blue))
+                resendButton.alpha = 1.0f
                 countdownTimerContainer.visibility = View.GONE
             }
         }.start()
diff --git a/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt b/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt
index 41fcbeaa0..a28a553e3 100644
--- a/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt
+++ b/app/src/main/java/deakin/gopher/guardian/view/general/RegisterActivity.kt
@@ -1,15 +1,18 @@
 package deakin.gopher.guardian.view.general
 
 import android.os.Bundle
-import android.view.View
 import android.widget.Button
 import android.widget.EditText
 import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.core.view.isVisible
+import androidx.core.widget.addTextChangedListener
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.button.MaterialButtonToggleGroup
+import com.google.android.material.textfield.TextInputLayout
+import com.google.gson.Gson
 import deakin.gopher.guardian.R
+import deakin.gopher.guardian.model.ApiErrorResponse
 import deakin.gopher.guardian.model.RegistrationStatusMessage
 import deakin.gopher.guardian.model.login.EmailAddress
 import deakin.gopher.guardian.model.login.Password
@@ -30,17 +33,29 @@ class RegisterActivity : BaseActivity() {
         val mEmail: EditText = findViewById(R.id.Email)
         val mPassword: EditText = findViewById(R.id.password)
         val passwordConfirmation: EditText = findViewById(R.id.passwordConfirm)
+        val nameLayout: TextInputLayout = findViewById(R.id.nameTextInputLayout)
+        val emailLayout: TextInputLayout = findViewById(R.id.emailTextInputLayout)
+        val passwordLayout: TextInputLayout = findViewById(R.id.passwordTextInputLayout)
+        val confirmPasswordLayout: TextInputLayout = findViewById(R.id.confirmPasswordTextInputLayout)
         val roleButton: MaterialButtonToggleGroup = findViewById(R.id.role_toggle_group)
         val backToLoginButton: Button = findViewById(R.id.backToLoginButton)
         val mRegisterBtn: Button = findViewById(R.id.registerBtn)
         val progressBar: ProgressBar = findViewById(R.id.progressBar)
 
+        mFullName.addTextChangedListener { nameLayout.error = null }
+        mEmail.addTextChangedListener { emailLayout.error = null }
+        mPassword.addTextChangedListener { passwordLayout.error = null }
+        passwordConfirmation.addTextChangedListener { confirmPasswordLayout.error = null }
+        roleButton.addOnButtonCheckedListener { _, _, _ -> 
+            // Optional: clear role error if you add one to the layout
+        }
+
         mRegisterBtn.setOnClickListener {
             val emailInput = mEmail.text.toString().trim { it <= ' ' }
             val passwordInput = mPassword.text.toString().trim { it <= ' ' }
             val passwordConfirmInput = passwordConfirmation.text.toString().trim { it <= ' ' }
             val nameInput = mFullName.text.toString().trim { it <= ' ' }
-            val roleInput = roleButton.checkedButtonId
+            val roleId = roleButton.checkedButtonId
 
             val registrationError =
                 validateInputs(
@@ -48,28 +63,32 @@ class RegisterActivity : BaseActivity() {
                     passwordInput,
                     passwordConfirmInput,
                     nameInput,
-                    roleInput,
+                    roleId,
                 )
 
             if (registrationError != null) {
-                Toast.makeText(
-                    applicationContext,
-                    registrationError.messageResourceId,
-                    Toast.LENGTH_LONG,
-                ).show()
+                when (registrationError) {
+                    RegistrationError.EmptyName -> nameLayout.error = getString(registrationError.messageResourceId)
+                    RegistrationError.EmptyEmail, RegistrationError.InvalidEmail -> emailLayout.error = getString(registrationError.messageResourceId)
+                    RegistrationError.EmptyPassword, RegistrationError.PasswordTooShort -> passwordLayout.error = getString(registrationError.messageResourceId)
+                    RegistrationError.EmptyConfirmedPassword, RegistrationError.PasswordsFailConfirmation -> confirmPasswordLayout.error = getString(registrationError.messageResourceId)
+                    RegistrationError.EmptyRole -> showMessage(getString(registrationError.messageResourceId))
+                }
                 return@setOnClickListener
             }
 
-            progressBar.visibility = View.VISIBLE
+            setLoading(true, mRegisterBtn, progressBar)
 
-            val emailAddress = EmailAddress(emailInput)
-            val password = Password(passwordInput)
-            val role = findViewById<MaterialButton>(roleInput).text.toString().lowercase()
+            val role = when (roleId) {
+                R.id.button_caretaker -> "caretaker"
+                R.id.button_nurse -> "nurse"
+                else -> ""
+            }
 
             val request =
                 RegisterRequest(
-                    email = emailAddress.emailAddress,
-                    password = password.password,
+                    email = emailInput,
+                    password = passwordInput,
                     name = nameInput,
                     role = role,
                 )
@@ -82,18 +101,13 @@ class RegisterActivity : BaseActivity() {
                         call: Call<AuthResponse>,
                         response: Response<AuthResponse>,
                     ) {
-                        progressBar.isVisible = false
+                        setLoading(false, mRegisterBtn, progressBar)
                         if (response.isSuccessful) {
-                            // Handle successful registration
-                            showMessage(RegistrationStatusMessage.Success.toString())
+                            showMessage(getString(R.string.registration_success))
                             NavigationService(this@RegisterActivity).toLogin()
                         } else {
-                            // Handle error
-                            showMessage(
-                                RegistrationStatusMessage.Failure.toString() + " : ${
-                                    response.errorBody()
-                                }",
-                            )
+                            val errorMsg = parseError(response)
+                            showMessage(getString(R.string.registration_failure) + (if (errorMsg != null) ": $errorMsg" else ""))
                         }
                     }
 
@@ -101,9 +115,8 @@ class RegisterActivity : BaseActivity() {
                         call: Call<AuthResponse>,
                         t: Throwable,
                     ) {
-                        // Handle failure
-                        progressBar.isVisible = false
-                        showMessage(RegistrationStatusMessage.Failure.toString() + ": ${t.message}")
+                        setLoading(false, mRegisterBtn, progressBar)
+                        showMessage(getString(R.string.registration_failure) + ": ${t.localizedMessage}")
                     }
                 },
             )
@@ -114,6 +127,23 @@ class RegisterActivity : BaseActivity() {
         }
     }
 
+    private fun setLoading(isLoading: Boolean, button: Button, progressBar: ProgressBar) {
+        button.isEnabled = !isLoading
+        progressBar.isVisible = isLoading
+    }
+
+    private fun parseError(response: Response<*>): String? {
+        return try {
+            val errorResponse = Gson().fromJson(
+                response.errorBody()?.string(),
+                ApiErrorResponse::class.java,
+            )
+            errorResponse.apiError
+        } catch (e: Exception) {
+            null
+        }
+    }
+
     private fun validateInputs(
         rawEmail: String?,
         rawPassword: String?,
@@ -121,6 +151,9 @@ class RegisterActivity : BaseActivity() {
         rawName: String?,
         roleInput: Int,
     ): RegistrationError? {
+        if (rawName.isNullOrEmpty()) {
+            return RegistrationError.EmptyName
+        }
         if (rawEmail.isNullOrEmpty()) {
             return RegistrationError.EmptyEmail
         }
@@ -147,11 +180,7 @@ class RegisterActivity : BaseActivity() {
             return RegistrationError.PasswordsFailConfirmation
         }
 
-        if (rawName.isNullOrEmpty()) {
-            return RegistrationError.EmptyName
-        }
-
-        if (roleInput == View.NO_ID) {
+        if (roleInput == android.view.View.NO_ID) {
             return RegistrationError.EmptyRole
         }
 
diff --git a/app/src/main/res/layout/account_creation.xml b/app/src/main/res/layout/account_creation.xml
index c26e201f3..473db4575 100644
--- a/app/src/main/res/layout/account_creation.xml
+++ b/app/src/main/res/layout/account_creation.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="deakin.gopher.guardian.view.general.LoginActivity">
+    tools:context="deakin.gopher.guardian.view.general.RegisterActivity">
 
     <androidx.cardview.widget.CardView
         android:id="@+id/cardView2"
@@ -63,118 +63,101 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:orientation="vertical"
-            android:padding="16dp"
-            tools:layout_editor_absoluteX="0dp"
-            tools:layout_editor_absoluteY="46dp">
+            android:padding="16dp">
 
             <ImageView
                 android:id="@+id/logoImageView"
                 android:layout_width="100dp"
                 android:layout_height="100dp"
                 android:layout_marginBottom="32dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.498"
-                app:layout_constraintStart_toStartOf="parent"
-                app:srcCompat="@drawable/agedcare_icon"
-                tools:layout_editor_absoluteY="16dp" />
+                app:srcCompat="@drawable/agedcare_icon" />
 
             <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/nameTextInputLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="300dp"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:errorEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/Fullname"
-                    android:layout_width="300dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="12dp"
-                    android:autofillHints=""
+                    android:autofillHints="name"
                     android:ems="10"
-                    android:focusable="auto"
                     android:hint="@string/full_name"
                     android:inputType="textPersonName"
                     android:paddingHorizontal="16dp" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/emailTextInputLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="300dp"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                app:errorEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/Email"
-                    android:layout_width="300dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="12dp"
-                    android:autofillHints=""
+                    android:autofillHints="emailAddress"
                     android:ems="10"
-                    android:focusable="auto"
                     android:hint="@string/email"
                     android:inputType="textEmailAddress"
-                    android:paddingHorizontal="16dp"
-                    android:textStyle="normal" />
+                    android:paddingHorizontal="16dp" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/passwordTextInputLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="300dp"
                 android:layout_height="wrap_content"
+                app:errorEnabled="true"
                 app:passwordToggleEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/password"
-                    android:layout_width="300dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="12dp"
-                    android:autofillHints=""
+                    android:autofillHints="password"
                     android:ems="10"
-                    android:focusable="auto"
                     android:hint="@string/password"
-                    android:inputType="textPassword"
-                    android:textStyle="normal" />
+                    android:inputType="textPassword" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/confirmPasswordTextInputLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="300dp"
                 android:layout_height="wrap_content"
+                app:errorEnabled="true"
                 app:passwordToggleEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/passwordConfirm"
-                    android:layout_width="300dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="12dp"
-                    android:autofillHints=""
+                    android:autofillHints="password"
                     android:ems="10"
-                    android:focusable="auto"
                     android:hint="@string/confirm_password"
-                    android:inputType="textPassword"
-                    android:textStyle="normal" />
+                    android:inputType="textPassword" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="8dp"
                 android:fontFamily="@font/poppins_bold"
-                android:text="@string/register_role_selection_prompt"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/imageView5" />
+                android:text="@string/register_role_selection_prompt" />
 
             <com.google.android.material.button.MaterialButtonToggleGroup
                 android:id="@+id/role_toggle_group"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="@dimen/activity_horizontal_margin"
+                android:layout_margin="8dp"
                 android:gravity="center"
                 app:singleSelection="true">
 
@@ -199,41 +182,33 @@
                 android:id="@+id/registerBtn"
                 android:layout_width="200dp"
                 android:layout_height="50dp"
+                android:layout_marginTop="16dp"
                 android:backgroundTint="@color/TG_blue"
                 android:fontFamily="@font/poppins_bold"
                 android:text="@string/create_account"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
-                app:cornerRadius="24dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.497"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:layout_editor_absoluteY="372dp" />
+                app:cornerRadius="24dp" />
 
             <Button
                 android:id="@+id/backToLoginButton"
                 android:layout_width="200dp"
                 android:layout_height="50dp"
+                android:layout_marginTop="8dp"
                 android:backgroundTint="@color/TG_blue"
                 android:fontFamily="@font/poppins_bold"
                 android:text="@string/back_to_login"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
-                app:cornerRadius="24dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.502"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:layout_editor_absoluteY="416dp" />
+                app:cornerRadius="24dp" />
 
             <ProgressBar
                 android:id="@+id/progressBar"
                 style="?android:attr/progressBarStyle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:visibility="invisible"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                tools:layout_editor_absoluteY="527dp" />
+                android:layout_marginTop="16dp"
+                android:visibility="invisible" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
     </ScrollView>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 759257a60..7e4b6237b 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -73,19 +73,20 @@
             android:orientation="vertical">
 
             <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/emailTextInputLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="300dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/activity_horizontal_margin"
-                android:layout_gravity="center_horizontal">
+                android:layout_gravity="center_horizontal"
+                app:errorEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/Email"
-                    android:layout_width="300dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="12dp"
-                    android:autofillHints=""
+                    android:autofillHints="emailAddress"
                     android:ems="10"
                     android:focusable="auto"
                     android:hint="@string/email"
@@ -95,19 +96,20 @@
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/passwordTextInputLayout"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="300dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
+                app:errorEnabled="true"
                 app:passwordToggleEnabled="true">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/password"
-                    android:layout_width="300dp"
-                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="57dp"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginBottom="@dimen/activity_horizontal_margin"
-                    android:autofillHints=""
+                    android:autofillHints="password"
                     android:ems="10"
                     android:focusable="auto"
                     android:hint="@string/password"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9fe4ecab0..35c8f0436 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -380,6 +380,12 @@
     <string name="current">Current</string>
     <string name="daily">Daily</string>
 
+    <string name="toast_pin_verified">Pin verified successfully</string>
+    <string name="error_validating_pin">Error validating PIN: %1$s</string>
+    <string name="toast_pin_sent">Pin sent to your email</string>
+    <string name="error_sending_pin">Error sending PIN: %1$s</string>
+    <string name="error_enter_6_digit_pin">Please enter a 6-digit PIN</string>
+
 
     <string-array name="hospital_list_array">
         <item>Royal Melbourne Hospital</item>
@@ -697,7 +703,7 @@
     <string name="cardio_exercise1">Cardio Exercise</string>
     <string name="cardio_exercise2">1. Gentle Walking: Walk at a steady pace indoors or outdoors (15–20 mins).\n2. Seated Marching: Lift knees alternately while seated (10–15 mins).\n3. Step Touch: Step side-to-side while lightly swinging arms (10–15 mins).\n4. Arm Swings: Swing arms while stepping in place for light cardio (10–15 mins).\n5. Heel Digs: Tap your heels forward alternately while seated or standing (10–15 mins).\n6. Low-Impact Dancing: Move gently to favorite music (10–15 mins).\n7. Seated Jumping Jacks: Extend arms and legs alternately while seated (10–15 reps).</string>
     <string name="breathing_exercise1">Breathing Exercise</string>
-    <string name="breathing_exercise2">1. Diaphragmatic Breathing: Deep inhale through the nose, expanding the belly, and slow exhale through the mouth (5 mins).\n2. Pursed-Lip Breathing: Inhale through the nose, exhale slowly through pursed lips (5 mins).\n3. Breath Counting: Count each inhale and exhale to focus on rhythm (5–10 mins).\n4. Alternate Nostril Breathing: Close one nostril, inhale through the other, then switch (5 mins).\n5. Box Breathing: Inhale for 4 seconds, hold for 4, exhale for 4, hold for 4 (5 mins).\n6. Humming Breath: Inhale deeply and hum while exhaling to relax (5 mins).\n7. 4-7-8 Breathing: Inhale for 4 seconds, hold for 7, exhale for 8 to calm the body (5 mins).</string>
+    <string name="breathing_exercise2">1. Diaphragmatic Breathing: Deep inhale through the nose, expanding the belly, and slow exhale through the mouth (5 mins).\n2. Pursed–Lip Breathing: Inhale through the nose, exhale slowly through pursed lips (5 mins).\n3. Breath Counting: Count each inhale and exhale to focus on rhythm (5–10 mins).\n4. Alternate Nostril Breathing: Close one nostril, inhale through the other, then switch (5 mins).\n5. Box Breathing: Inhale for 4 seconds, hold for 4, exhale for 4, hold for 4 (5 mins).\n6. Humming Breath: Inhale deeply and hum while exhaling to relax (5 mins).\n7. 4-7-8 Breathing: Inhale for 4 seconds, hold for 7, exhale for 8 to calm the body (5 mins).</string>
     <string name="balance_exercise1">Balance Exercise</string>
     <string name="balance_exercise2">1. Single-Leg Stand: Lift one foot while holding onto a stable surface (10 secs per leg, 10 reps).\n2. Heel-to-Toe Walk: Walk in a straight line, placing one foot directly in front of the other (10 steps).\n3. Side Leg Lifts: Lift one leg to the side while holding a chair for support (10 reps per leg).\n4. Rock the Boat: Stand with feet apart and shift weight from one foot to the other (10–15 reps).\n5. Tandem Stance: Stand with one foot directly in front of the other for balance (hold 10 secs).\n6. Weight Shifting: Slowly shift your weight from heels to toes while standing (10 reps).\n7. Clock Reach: Stand on one foot and extend the opposite arm to touch \"12, 3, 6, and 9 o’clock\" positions (5 rounds per foot).</string>
     <string name="save_for_later">Save for Later</string>
@@ -722,5 +728,4 @@
         <item quantity="one">%d second</item>
         <item quantity="other">%d seconds</item>
     </plurals>
-</resources>
-
+</resources>
\ No newline at end of file