diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt
index 0f54983fcb..5858e78a2a 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt
@@ -17,6 +17,7 @@
 package im.vector.app.ui.robot.settings
 
 import androidx.test.espresso.Espresso.pressBack
+import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertDisplayed
 import com.adevinta.android.barista.interaction.BaristaClickInteractions.clickOn
 import im.vector.app.R
 import im.vector.app.espresso.tools.clickOnPreference
@@ -41,6 +42,15 @@ class SettingsNotificationsRobot {
         clickOn(R.string.settings_call_notifications_preferences)
         pressBack()
          */
+        // Email notification. No Emails are configured so we show go to the screen to add email
+        clickOnPreference(R.string.settings_notification_emails_no_emails)
+        assertDisplayed(R.string.settings_emails_and_phone_numbers_title)
+        pressBack()
+
+        // Display the notification method change dialog
+        clickOnPreference(R.string.settings_notification_method)
+        pressBack()
+
         clickOnPreference(R.string.settings_notification_troubleshoot)
         // Give time for the tests to perform
         Thread.sleep(12_000)
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index e8dbdfb644..38a3f3c935 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -3073,7 +3073,7 @@
     <string name="unifiedpush_getdistributors_dialog_title">Choose how to receive notifications</string>
     <string name="unifiedpush_distributor_fcm_fallback">Google Services</string>
     <string name="unifiedpush_distributor_background_sync">Background synchronization</string>
-    <string name="settings_unifiedpush_reregister">Notification method</string>
+    <string name="settings_notification_method">Notification method</string>
     <string name="settings_troubleshoot_test_distributors_title">Available methods</string>
     <string name="settings_troubleshoot_test_distributors_gplay">No other method than Google Play Service found.</string>
     <string name="settings_troubleshoot_test_distributors_fdroid">No other method than background synchronization found.</string>
diff --git a/vector/src/main/res/xml/vector_settings_notifications.xml b/vector/src/main/res/xml/vector_settings_notifications.xml
index 21590dc0ad..6ca2811a72 100644
--- a/vector/src/main/res/xml/vector_settings_notifications.xml
+++ b/vector/src/main/res/xml/vector_settings_notifications.xml
@@ -55,7 +55,7 @@
             android:dependency="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
             android:key="SETTINGS_UNIFIED_PUSH_RE_REGISTER_KEY"
             android:persistent="false"
-            android:title="@string/settings_unifiedpush_reregister" />
+            android:title="@string/settings_notification_method" />
 
         <!-- For API < 26 -->
         <im.vector.app.core.preference.VectorPreference