diff --git a/app/src/main/java/ee/ria/DigiDoc/android/signature/update/mobileid/MobileIdView.java b/app/src/main/java/ee/ria/DigiDoc/android/signature/update/mobileid/MobileIdView.java
index b0658cab2..0c93fd179 100644
--- a/app/src/main/java/ee/ria/DigiDoc/android/signature/update/mobileid/MobileIdView.java
+++ b/app/src/main/java/ee/ria/DigiDoc/android/signature/update/mobileid/MobileIdView.java
@@ -170,13 +170,9 @@ public void setDefaultPhoneNoPrefix(String phoneNoPrefix) {
     }
 
     private void setAccessibilityDescription() {
-        phoneNoView.setContentDescription(AccessibilityUtils.getTextViewAccessibility(phoneNoView));
-        personalCodeView.setContentDescription(AccessibilityUtils.getTextViewAccessibility(personalCodeView));
-        AccessibilityUtils.setSingleCharactersContentDescriptionWithHint(
-                phoneNoView,
-                getResources().getString(R.string.signature_update_mobile_id_phone_no),
-                getResources().getString(R.string.mobile_id_country_code_and_phone_number_placeholder)
-        );
+        phoneNoView.setContentDescription(String.format("%s, %s", countryAndPhoneNoLabel.getText(), AccessibilityUtils.getTextViewAccessibility(phoneNoView)));
+        personalCodeView.setContentDescription(String.format("%s, %s", personalCodeLabelText.getText(), AccessibilityUtils.getTextViewAccessibility(personalCodeView)));
+        AccessibilityUtils.setSingleCharactersContentDescription(phoneNoView, getResources().getString(R.string.signature_update_mobile_id_phone_no));
         AccessibilityUtils.setSingleCharactersContentDescription(personalCodeView, getResources().getString(R.string.signature_update_mobile_id_personal_code));
         AccessibilityUtils.setEditTextCursorToEnd(phoneNoView);
         AccessibilityUtils.setEditTextCursorToEnd(personalCodeView);
diff --git a/app/src/main/java/ee/ria/DigiDoc/android/signature/update/smartid/SmartIdView.java b/app/src/main/java/ee/ria/DigiDoc/android/signature/update/smartid/SmartIdView.java
index 94545336a..a791ff8fb 100644
--- a/app/src/main/java/ee/ria/DigiDoc/android/signature/update/smartid/SmartIdView.java
+++ b/app/src/main/java/ee/ria/DigiDoc/android/signature/update/smartid/SmartIdView.java
@@ -317,8 +317,8 @@ private String getCountryViewAccessibilityText() {
     }
 
     private void setAccessibilityDescription() {
-        personalCodeView.setContentDescription(getResources().getString(R.string.signature_update_mobile_id_personal_code) + " " +
-                AccessibilityUtils.getTextViewAccessibility(personalCodeView));
+        personalCodeView.setContentDescription(String.format("%s, %s", getResources().getString(R.string.signature_update_mobile_id_personal_code),
+                AccessibilityUtils.getTextViewAccessibility(personalCodeView)));
         AccessibilityUtils.setSingleCharactersContentDescription(personalCodeView,
                 getResources().getString(R.string.signature_update_mobile_id_personal_code));
         AccessibilityUtils.setEditTextCursorToEnd(personalCodeView);