diff --git a/src/panels/config/cloud/account/cloud-account.ts b/src/panels/config/cloud/account/cloud-account.ts
index 978bd323fe..46293adf67 100644
--- a/src/panels/config/cloud/account/cloud-account.ts
+++ b/src/panels/config/cloud/account/cloud-account.ts
@@ -88,7 +88,10 @@ export class CloudAccount extends SubscribeMixin(LitElement) {
             >
               <div class="account-row">
                 <paper-item-body two-line>
-                  ${this.cloudStatus.email}
+                  ${this.cloudStatus.email.replace(
+                    /(\w{3})[\w.-]+@([\w.]+\w)/,
+                    "$1***@$2"
+                  )}
                   <div secondary class="wrap">
                     ${this._subscription
                       ? this._subscription.human_description.replace(
diff --git a/src/panels/config/cloud/account/cloud-remote-pref.ts b/src/panels/config/cloud/account/cloud-remote-pref.ts
index 3703cd85d7..d195b49890 100644
--- a/src/panels/config/cloud/account/cloud-remote-pref.ts
+++ b/src/panels/config/cloud/account/cloud-remote-pref.ts
@@ -51,11 +51,6 @@ export class CloudRemotePref extends LitElement {
       `;
     }
 
-    const urlParts = remote_domain!.split(".");
-    const hiddenURL = `https://${urlParts[0].substring(0, 5)}***.${
-      urlParts[1]
-    }.${urlParts[2]}.${urlParts[3]}`;
-
     return html`
       <ha-card
         outlined
@@ -92,8 +87,9 @@ export class CloudRemotePref extends LitElement {
             target="_blank"
             class="break-word"
             rel="noreferrer"
-          >
-            ${hiddenURL}</a
+            >${this.hass.localize(
+              "ui.panel.config.cloud.account.remote.nabu_casa_url"
+            )}</a
           >.
           <ha-svg-icon
             .url=${`https://${remote_domain}`}
diff --git a/src/translations/en.json b/src/translations/en.json
index 76f334bfce..8b6c023faa 100755
--- a/src/translations/en.json
+++ b/src/translations/en.json
@@ -2373,8 +2373,8 @@
               "reconnecting": "Not connected. Trying to reconnect.",
               "access_is_being_prepared": "Remote control is being prepared. We will notify you when it's ready.",
               "info": "Home Assistant Cloud provides a secure remote connection to your instance while away from home.",
-              "instance_is_available": "Your instance is available at",
-              "instance_will_be_available": "Your instance will be available at",
+              "instance_is_available": "Your instance is available at your",
+              "instance_will_be_available": "Your instance will be available at your",
               "link_learn_how_it_works": "Learn how it works",
               "certificate_info": "Certificate Info"
             },