diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
index 28331bc99e..980525363a 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginServerUrlFormFragment.kt
@@ -68,7 +68,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment()
                 loginServerUrlFormText.text = getString(R.string.login_server_url_form_modular_text)
                 loginServerUrlFormLearnMore.isVisible = true
                 loginServerUrlFormHomeServerUrlTil.hint = getText(R.string.login_server_url_form_modular_hint)
-                loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_modular_notice)
+                loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_common_notice)
             }
             else               -> {
                 loginServerUrlFormIcon.isVisible = false
@@ -76,7 +76,7 @@ class LoginServerUrlFormFragment @Inject constructor() : AbstractLoginFragment()
                 loginServerUrlFormText.text = getString(R.string.login_connect_to_a_custom_server)
                 loginServerUrlFormLearnMore.isVisible = false
                 loginServerUrlFormHomeServerUrlTil.hint = getText(R.string.login_server_url_form_other_hint)
-                loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_other_notice)
+                loginServerUrlFormNotice.text = getString(R.string.login_server_url_form_common_notice)
             }
         }
     }
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index 5298087e09..d623500b0d 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -81,7 +81,7 @@
                 android:layout_marginTop="6dp"
                 android:gravity="start"
                 android:textAppearance="@style/TextAppearance.Vector.Login.Text.Small"
-                tools:text="@string/login_server_url_form_modular_notice" />
+                tools:text="@string/login_server_url_form_common_notice" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginServerUrlFormSubmit"
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index 830868a255..6a9189b84a 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -1824,14 +1824,14 @@
 
     <string name="login_continue">Продължи</string>
     <string name="login_connect_to">Свържи се с %1$s</string>
-    <string name="login_connect_to_modular">Свърже се с Modular</string>
+    <string name="login_connect_to_modular">Свърже се с Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Свържи се със собствен сървър</string>
     <string name="login_signin_to">Влез в %1$s</string>
     <string name="login_signup">Регистрация</string>
     <string name="login_signin">Вход</string>
     <string name="login_signin_sso">Продължи със SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Modular адрес</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services адрес</string>
     <string name="login_server_url_form_other_hint">Адрес</string>
     <string name="login_server_url_form_modular_text">Премиум хостинг за организации</string>
     <string name="login_server_url_form_modular_notice">Въведете адреса на Modular Element или на сървър, който искате да използвате</string>
@@ -1908,7 +1908,7 @@
 \nПрекратяване на процеса на регистрация\?</string>
 
     <string name="login_a11y_choose_matrix_org">Избери matrix.org</string>
-    <string name="login_a11y_choose_modular">Избери Modular</string>
+    <string name="login_a11y_choose_modular">Избери Element Matrix Services</string>
     <string name="login_a11y_choose_other">Избери собствен сървър</string>
     <string name="login_a11y_captcha_container">Моля извършете captcha проверката</string>
     <string name="login_terms_title">Приемете условията за да продължите</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index f532552984..f082a68fa8 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1812,14 +1812,14 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 
     <string name="login_continue">Pokračovat</string>
     <string name="login_connect_to">Připojit k %1$s</string>
-    <string name="login_connect_to_modular">Připojit k Modular</string>
+    <string name="login_connect_to_modular">Připojit k Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Upravit připojení k serveru</string>
     <string name="login_signin_to">Přihlásit se na %1$s</string>
     <string name="login_signup">Založit účet</string>
     <string name="login_signin">Přihlásit se</string>
     <string name="login_signin_sso">Pokračovat s SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Adresa Modular</string>
+    <string name="login_server_url_form_modular_hint">Adresa Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Adresa</string>
     <string name="login_server_url_form_modular_text">Prémiový hosting pro organizace</string>
     <string name="login_server_url_form_modular_notice">Zadejte adresu Modular Element nebo serveru, který chcete použít</string>
@@ -1895,7 +1895,7 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
 \nZastavit registrační proces\?</string>
 
     <string name="login_a11y_choose_matrix_org">Vybrat matrix.org</string>
-    <string name="login_a11y_choose_modular">Vybrat modular</string>
+    <string name="login_a11y_choose_modular">Vybrat Element Matrix Services</string>
     <string name="login_a11y_choose_other">Vybrat upravený homeserver</string>
     <string name="login_a11y_captcha_container">Prosím, proveďte vybídnutí captcha</string>
     <string name="login_terms_title">Přijmout všeobecné podmínky a pokračovat</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index eff21b4336..b6afec5775 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1879,14 +1879,14 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
 
     <string name="login_splash_text3">Erweitere &amp; individualisiere dein Benutzererlebnis</string>
     <string name="login_connect_to">Verbinde mit %1$s</string>
-    <string name="login_connect_to_modular">Mit Modular verbinden</string>
+    <string name="login_connect_to_modular">Mit Element Matrix Services verbinden</string>
     <string name="login_connect_to_a_custom_server">Mit einem benutzerdefinierten Server verbinden</string>
     <string name="login_signin_to">Bei %1$s anmelden</string>
     <string name="login_signup">Registrieren</string>
     <string name="login_signin">Anmelden</string>
     <string name="login_signin_sso">Mit einmaligem Anmelden fortfahren</string>
 
-    <string name="login_server_url_form_modular_hint">Modular Adresse</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services Adresse</string>
     <string name="login_server_url_form_other_hint">Adresse</string>
     <string name="login_sso_error_message">Ein Fehler beim Laden der Seite %1$s (%2$d) ist aufgetreten</string>
     <string name="login_registration_disabled">Es tut uns leid. Dieser Server akzeptiert keine neuen Benutzerkonten.</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index bb6fa11b3b..af0a2df798 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1877,7 +1877,7 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
 
     <string name="login_continue">Continuar</string>
     <string name="login_connect_to">Conectarse a %1$s</string>
-    <string name="login_connect_to_modular">Conectarse a Modular</string>
+    <string name="login_connect_to_modular">Conectarse a Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Conectarse a un servidor externo</string>
     <string name="login_signin_to">Iniciar sesión en %1$s</string>
     <string name="login_signup">Registrarse</string>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 6cf6a8d88a..21f71aee49 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1826,14 +1826,14 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 
     <string name="login_continue">Jarraitu</string>
     <string name="login_connect_to">Konektatu %1$s zerbitzarira</string>
-    <string name="login_connect_to_modular">Konektatu Modular-era</string>
+    <string name="login_connect_to_modular">Konektatu Element Matrix Services-era</string>
     <string name="login_connect_to_a_custom_server">Konektatu zerbitzari pertsonalizatu batera</string>
     <string name="login_signin_to">Hasi saioa %1$s zerbitzarian</string>
     <string name="login_signup">Erregistratu</string>
     <string name="login_signin">Hasi saioa</string>
     <string name="login_signin_sso">Jarraitu SSO-rekin</string>
 
-    <string name="login_server_url_form_modular_hint">Modular helbidea</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services helbidea</string>
     <string name="login_server_url_form_other_hint">Helbidea</string>
     <string name="login_server_url_form_modular_text">Ordainpeko ostatatzea elkarteentzat</string>
     <string name="login_server_url_form_modular_notice">Sartu erabili nahi duzun Modular Element edo zerbitzariaren helbidea</string>
@@ -1910,7 +1910,7 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
 \nUtzi erregistratze prozesua\?</string>
 
     <string name="login_a11y_choose_matrix_org">Hautatu matrix.org</string>
-    <string name="login_a11y_choose_modular">Hautatu modular</string>
+    <string name="login_a11y_choose_modular">Hautatu Element Matrix Services</string>
     <string name="login_a11y_choose_other">Hautatu hasiera-zerbitzari pertsonalizatu bat</string>
     <string name="login_a11y_captcha_container">Bete captcha erronka</string>
     <string name="login_terms_title">Onartu baldintzak jarraitzeko</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index cbed8cc350..be706404e7 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -1881,14 +1881,14 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 
     <string name="login_continue">Jatka</string>
     <string name="login_connect_to">Yhdistä palvelimeen %1$s</string>
-    <string name="login_connect_to_modular">Yhdistä Modulariin</string>
+    <string name="login_connect_to_modular">Yhdistä Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Yhdistä itse määritettyyn palvelimeen</string>
     <string name="login_signin_to">Kirjaudu sisään palvelimeen %1$s</string>
     <string name="login_signup">Rekisteröidy</string>
     <string name="login_signin">Kirjaudu sisään</string>
     <string name="login_signin_sso">Jatka kertakirjautumiseen</string>
 
-    <string name="login_server_url_form_modular_hint">Modularin osoite</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services in osoite</string>
     <string name="login_server_url_form_other_hint">Osoite</string>
     <string name="login_server_url_form_modular_text">Korkealuokkaista isännöintiä organisaatioille</string>
     <string name="login_server_url_form_modular_notice">Syötä Modular Elementin tai haluamasi palvelimen osoite</string>
@@ -1963,7 +1963,7 @@ Jotta et menetä mitään, automaattiset päivitykset kannattaa pitää käytös
 \nPeru rekisteröintiprosessi\?</string>
 
     <string name="login_a11y_choose_matrix_org">Valitse matrix.org</string>
-    <string name="login_a11y_choose_modular">Valitse modular</string>
+    <string name="login_a11y_choose_modular">Valitse Element Matrix Services</string>
     <string name="login_a11y_choose_other">Valitse muu kotipalvelin</string>
     <string name="login_a11y_captcha_container">Ratkaise seuraava kuvavarmennushaaste</string>
     <string name="login_terms_title">Hyväksy ehdot jatkaaksesi</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index f85fcd2147..fe19418efb 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1835,14 +1835,14 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 
     <string name="login_continue">Continuer</string>
     <string name="login_connect_to">Se connecter à %1$s</string>
-    <string name="login_connect_to_modular">Se connecter à Modular</string>
+    <string name="login_connect_to_modular">Se connecter à Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Se connecter à un serveur personnalisé</string>
     <string name="login_signin_to">S’authentifier sur %1$s</string>
     <string name="login_signup">S’inscrire</string>
     <string name="login_signin">S’authentifier</string>
     <string name="login_signin_sso">Continuer avec l’authentification unique</string>
 
-    <string name="login_server_url_form_modular_hint">Adresse Modular</string>
+    <string name="login_server_url_form_modular_hint">Adresse Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Adresse</string>
     <string name="login_server_url_form_modular_text">Hébergement privé pour les organisations</string>
     <string name="login_server_url_form_modular_notice">Saisir l’adresse de Element ou du serveur de Modular que vous voulez utiliser</string>
@@ -1919,7 +1919,7 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
 \nArrêter le processus de création \?</string>
 
     <string name="login_a11y_choose_matrix_org">Sélectionner matrix.org</string>
-    <string name="login_a11y_choose_modular">Sélectionner Modular</string>
+    <string name="login_a11y_choose_modular">Sélectionner Element Matrix Services</string>
     <string name="login_a11y_choose_other">Sélectionner un serveur d’accueil personnalisé</string>
     <string name="login_a11y_captcha_container">Veuillez compléter le captcha</string>
     <string name="login_terms_title">Acceptez les termes pour continuer</string>
diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml
index 5c62d0877f..955d3bc8d1 100644
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/vector/src/main/res/values-hr/strings.xml
@@ -1464,14 +1464,14 @@
 
     <string name="login_continue">Nastavi</string>
     <string name="login_connect_to">Spoji se na %1$s</string>
-    <string name="login_connect_to_modular">Spoji se na Modular</string>
+    <string name="login_connect_to_modular">Spoji se na Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Spoji se na prilagođenog poslužitelja</string>
     <string name="login_signin_to">Prijavi se na %1$s</string>
     <string name="login_signup">Otvori račun</string>
     <string name="login_signin">Prijavi se</string>
     <string name="login_signin_sso">Nastavi sa SSO-om</string>
 
-    <string name="login_server_url_form_modular_hint">Adresa u Modularu</string>
+    <string name="login_server_url_form_modular_hint">Adresa u Element Matrix Services u</string>
     <string name="login_server_url_form_other_hint">Adresa</string>
     <string name="login_server_url_form_modular_text">Plaćeno gošćenje za organizacije</string>
     <string name="login_server_url_form_modular_notice">Unesite adresu Modular Elementa ili poslužitelja koji želite koristiti</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 890d547fde..9c5702a38f 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1830,14 +1830,14 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 
     <string name="login_continue">Folytatás</string>
     <string name="login_connect_to">Csatlakozás ide: %1$s</string>
-    <string name="login_connect_to_modular">Csatlakozás Modularhoz</string>
+    <string name="login_connect_to_modular">Csatlakozás Element Matrix Services hoz</string>
     <string name="login_connect_to_a_custom_server">Csatlakozás egyedi matrix szerverhez</string>
     <string name="login_signin_to">Bejelentkezés ide: %1$s</string>
     <string name="login_signup">Fiók készítés</string>
     <string name="login_signin">Bejelentkezés</string>
     <string name="login_signin_sso">SSO-val való folytatás</string>
 
-    <string name="login_server_url_form_modular_hint">Modular Cím</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services Cím</string>
     <string name="login_server_url_form_other_hint">Cím</string>
     <string name="login_server_url_form_modular_text">Prémium üzemeltetés szervezetek részére</string>
     <string name="login_server_url_form_modular_notice">Add meg az általad használt Modular szerver, vagy a hozzá tartozó Element címét</string>
@@ -1914,7 +1914,7 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
 \nMegállítód a regisztrációt\?</string>
 
     <string name="login_a11y_choose_matrix_org">matrix.org kiválasztása</string>
-    <string name="login_a11y_choose_modular">Modular kiválasztása</string>
+    <string name="login_a11y_choose_modular">Element Matrix Services kiválasztása</string>
     <string name="login_a11y_choose_other">Egyedi matrix szerver kiválasztása</string>
     <string name="login_a11y_captcha_container">Kérlek old meg a captcha-t</string>
     <string name="login_terms_title">Folytatáshoz fogadd el a feltételeket</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 1c9bb2bf2c..eeffdee768 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1880,14 +1880,14 @@
 
     <string name="login_continue">Continua</string>
     <string name="login_connect_to">Connetti a %1$s</string>
-    <string name="login_connect_to_modular">Connetti a Modular</string>
+    <string name="login_connect_to_modular">Connetti a Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Connetti ad un server personalizzato</string>
     <string name="login_signin_to">Accedi a %1$s</string>
     <string name="login_signup">Registrati</string>
     <string name="login_signin">Accedi</string>
     <string name="login_signin_sso">Continua con SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Indirizzo Modular</string>
+    <string name="login_server_url_form_modular_hint">Indirizzo Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Indirizzo</string>
     <string name="login_server_url_form_modular_text">Hosting premium per organizzazioni</string>
     <string name="login_server_url_form_modular_notice">Inserisci l\'indirizzo del Element Modular o del server che vuoi usare</string>
@@ -1964,7 +1964,7 @@
 \nFermare il processo di registrazione\?</string>
 
     <string name="login_a11y_choose_matrix_org">Seleziona matrix.org</string>
-    <string name="login_a11y_choose_modular">Seleziona Modular</string>
+    <string name="login_a11y_choose_modular">Seleziona Element Matrix Services</string>
     <string name="login_a11y_choose_other">Seleziona un server personalizzato</string>
     <string name="login_a11y_captcha_container">Completa la verifica Captcha</string>
     <string name="login_terms_title">Accetta le condizioni per continuare</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 1ee4411034..a77fda2994 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1815,14 +1815,14 @@ Spróbuj uruchomić ponownie aplikację.</string>
 
     <string name="login_continue">Kontynuuj</string>
     <string name="login_connect_to">Połącz z %1$s</string>
-    <string name="login_connect_to_modular">Połącz z Modular</string>
+    <string name="login_connect_to_modular">Połącz z Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Połącz z serwerem niestandardowym</string>
     <string name="login_signin_to">Zaloguj się do %1$s</string>
     <string name="login_signup">Zarejestruj</string>
     <string name="login_signin">Zaloguj się</string>
     <string name="login_signin_sso">Kontynuuj za pomocą logowania jednostopniowego</string>
 
-    <string name="login_server_url_form_modular_hint">Adres Modular</string>
+    <string name="login_server_url_form_modular_hint">Adres Element Matrix Services</string>
     <string name="login_server_url_form_other_hint">Adres</string>
     <string name="login_server_url_form_modular_text">Hosting premium dla organizacji</string>
     <string name="login_server_url_form_modular_notice">Wprowadź adres Element Modular lub serwera którego chcesz użyć</string>
@@ -1900,7 +1900,7 @@ Spróbuj uruchomić ponownie aplikację.</string>
 \nZatrzymać proces rejestracji\?</string>
 
     <string name="login_a11y_choose_matrix_org">Wybierz matrix.org</string>
-    <string name="login_a11y_choose_modular">Wybierz modular</string>
+    <string name="login_a11y_choose_modular">Wybierz Element Matrix Services</string>
     <string name="login_a11y_choose_other">Wybierz niestandardowy serwer domowy</string>
     <string name="login_a11y_captcha_container">Wypełnij zadanie Captcha</string>
     <string name="login_terms_title">Zaakceptuj warunki aby kontynuować</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index f10ec43691..82f2accfda 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -1869,7 +1869,7 @@
 
     <string name="login_continue">Продолжить</string>
     <string name="login_connect_to">Подключиться к %1$s</string>
-    <string name="login_connect_to_modular">Подключиться к Modular</string>
+    <string name="login_connect_to_modular">Подключиться к Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Подключиться к пользовательскому серверу</string>
     <string name="login_signup">Зарегистрироваться</string>
     <string name="login_signin">Войти в систему</string>
@@ -1946,7 +1946,7 @@
 \nОстановить процесс регистрации\?</string>
 
     <string name="login_a11y_choose_matrix_org">Выбрать matrix.org</string>
-    <string name="login_a11y_choose_modular">Выбрать modular</string>
+    <string name="login_a11y_choose_modular">Выбрать Element Matrix Services</string>
     <string name="login_a11y_choose_other">Выбрать другой сервер</string>
     <string name="login_a11y_captcha_container">Пожалуйста, пройдите проверку капчей</string>
     <string name="login_terms_title">Примите условия для продолжения</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index 0efde4d3ac..eae67a0c3e 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1787,14 +1787,14 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 
     <string name="login_continue">Vazhdo</string>
     <string name="login_connect_to">Lidhu me %1$s</string>
-    <string name="login_connect_to_modular">Lidhu me një shërbyes modular</string>
+    <string name="login_connect_to_modular">Lidhu me një shërbyes Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Lidhu me një shërbyes vetjak</string>
     <string name="login_signin_to">Hyni te %1$s</string>
     <string name="login_signup">Regjistrohuni</string>
     <string name="login_signin">Hyni</string>
     <string name="login_signin_sso">Vazhdoni me SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Adresë Modulari</string>
+    <string name="login_server_url_form_modular_hint">Adresë Element Matrix Services i</string>
     <string name="login_server_url_form_other_hint">Adresë</string>
     <string name="login_server_url_form_modular_text">Strehim me pagesë për ente</string>
     <string name="login_server_url_form_modular_notice">Jepni adresën e Modular Element-it ose Shërbyesit që doni të përdoret</string>
@@ -1871,7 +1871,7 @@ Që të garantoni se s’ju shpëton gjë, thjesht mbajeni të aktivizuar mekani
 \nTë ndalet procesi i regjistrimit\?</string>
 
     <string name="login_a11y_choose_matrix_org">Përzgjidhni matrix.org</string>
-    <string name="login_a11y_choose_modular">Përzgjidhni modular</string>
+    <string name="login_a11y_choose_modular">Përzgjidhni Element Matrix Services</string>
     <string name="login_a11y_choose_other">Përzgjidhni një shërbyes Home vetjak</string>
     <string name="login_a11y_captcha_container">Ju lutemi, zgjidhni captcha-n</string>
     <string name="login_terms_title">Që të vazhdohet, pranoni terma</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 04aea0ee23..b91b332007 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1784,14 +1784,14 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 
     <string name="login_continue">繼續</string>
     <string name="login_connect_to">連線到 %1$s</string>
-    <string name="login_connect_to_modular">連線到 Modular</string>
+    <string name="login_connect_to_modular">連線到 Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">連線到自訂伺服器</string>
     <string name="login_signin_to">登入到 %1$s</string>
     <string name="login_signup">註冊</string>
     <string name="login_signin">登入</string>
     <string name="login_signin_sso">以 SSO 繼續</string>
 
-    <string name="login_server_url_form_modular_hint">Modular 位置</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services 位置</string>
     <string name="login_server_url_form_other_hint">位置</string>
     <string name="login_server_url_form_modular_text">組織有專業主機</string>
     <string name="login_server_url_form_modular_notice">輸入 Modular Element 或您想要使用的伺服器位置</string>
@@ -1868,7 +1868,7 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
 \n停止註冊程序？</string>
 
     <string name="login_a11y_choose_matrix_org">選取 matrix.org</string>
-    <string name="login_a11y_choose_modular">選取 modular</string>
+    <string name="login_a11y_choose_modular">選取 Element Matrix Services</string>
     <string name="login_a11y_choose_other">選取自訂的家伺服器</string>
     <string name="login_a11y_captcha_container">請執行 captcha 挑戰</string>
     <string name="login_terms_title">接受條款以繼續</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index e5cb411bd0..6296e9175d 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1896,7 +1896,7 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
     <string name="login_continue">Continue</string>
     <!-- Replaced string is the homeserver url -->
     <string name="login_connect_to">Connect to %1$s</string>
-    <string name="login_connect_to_modular">Connect to Modular</string>
+    <string name="login_connect_to_modular">Connect to Element Matrix Services</string>
     <string name="login_connect_to_a_custom_server">Connect to a custom server</string>
     <!-- Replaced string is the homeserver url -->
     <string name="login_signin_to">Sign in to %1$s</string>
@@ -1904,11 +1904,12 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
     <string name="login_signin">Sign In</string>
     <string name="login_signin_sso">Continue with SSO</string>
 
-    <string name="login_server_url_form_modular_hint">Modular Address</string>
+    <string name="login_server_url_form_modular_hint">Element Matrix Services Address</string>
     <string name="login_server_url_form_other_hint">Address</string>
     <string name="login_server_url_form_modular_text">Premium hosting for organisations</string>
     <string name="login_server_url_form_modular_notice">Enter the address of the Modular Element or Server you want to use</string>
     <string name="login_server_url_form_other_notice">Enter the address of a server or a Element you want to connect to</string>
+    <string name="login_server_url_form_common_notice">Enter the address of the server you want to use</string>
 
     <string name="login_sso_error_message">An error occurred when loading the page: %1$s (%2$d)</string>
     <string name="login_mode_not_supported">The application is not able to signin to this homeserver. The homeserver supports the following signin type(s): %1$s.\n\nDo you want to signin using a web client?</string>
@@ -1978,7 +1979,7 @@ Not all features in Riot are implemented in Element yet. Main missing (and comin
     <string name="login_signup_cancel_confirmation_content">Your account is not created yet.\n\nStop the registration process?</string>
 
     <string name="login_a11y_choose_matrix_org">Select matrix.org</string>
-    <string name="login_a11y_choose_modular">Select modular</string>
+    <string name="login_a11y_choose_modular">Select Element Matrix Services</string>
     <string name="login_a11y_choose_other">Select a custom homeserver</string>
     <string name="login_a11y_captcha_container">Please perform the captcha challenge</string>
     <string name="login_terms_title">Accept terms to continue</string>