diff --git a/SessionUIKit/Components/ConfirmationModal.swift b/SessionUIKit/Components/ConfirmationModal.swift
index 467db3146..bd2e3f01d 100644
--- a/SessionUIKit/Components/ConfirmationModal.swift
+++ b/SessionUIKit/Components/ConfirmationModal.swift
@@ -275,9 +275,11 @@ public class ConfirmationModal: Modal, UITextFieldDelegate {
         
         titleLabel.isAccessibilityElement = true
         titleLabel.accessibilityIdentifier = "Modal heading" // stringlint:disable
+        titleLabel.accessibilityLabel = titleLabel.text
         
         explanationLabel.isAccessibilityElement = true
         explanationLabel.accessibilityIdentifier = "Modal description" // stringlint:disable
+        explanationLabel.accessibilityLabel = explanationLabel.text
     }
     
     // MARK: - UITextFieldDelegate
diff --git a/SessionUIKit/Components/SwiftUI/SessionTextField.swift b/SessionUIKit/Components/SwiftUI/SessionTextField.swift
index fd1120f3c..24fd44cf9 100644
--- a/SessionUIKit/Components/SwiftUI/SessionTextField.swift
+++ b/SessionUIKit/Components/SwiftUI/SessionTextField.swift
@@ -122,7 +122,8 @@ public struct SessionTextField<ExplanationView>: View where ExplanationView: Vie
                         .multilineTextAlignment(.center)
                         .accessibility(
                             Accessibility(
-                                identifier: "Error message"
+                                identifier: "Error message",
+                                label: error ?? previousError
                             )
                         )
                 } else {