diff --git a/src/panels/config/cloud/forgot-password/cloud-forgot-password.js b/src/panels/config/cloud/forgot-password/cloud-forgot-password.js
index 65b0ee4708..35d3c7969e 100644
--- a/src/panels/config/cloud/forgot-password/cloud-forgot-password.js
+++ b/src/panels/config/cloud/forgot-password/cloud-forgot-password.js
@@ -125,8 +125,9 @@ class CloudForgotPassword extends LocalizeMixin(EventsMixin(PolymerElement)) {
         () => {
           this._requestInProgress = false;
           this.fire("cloud-done", {
-            flashMessage:
-              "[[localize('ui.panel.config.cloud.forgot_password.check_your_email')]]",
+            flashMessage: this.hass.localize(
+              "ui.panel.config.cloud.forgot_password.check_your_email"
+            ),
           });
         },
         (err) =>
diff --git a/src/panels/config/cloud/login/cloud-login.js b/src/panels/config/cloud/login/cloud-login.js
index c5ac31c43d..3b060d9bd1 100644
--- a/src/panels/config/cloud/login/cloud-login.js
+++ b/src/panels/config/cloud/login/cloud-login.js
@@ -16,6 +16,7 @@ import LocalizeMixin from "../../../../mixins/localize-mixin";
 import NavigateMixin from "../../../../mixins/navigate-mixin";
 import "../../../../styles/polymer-ha-style";
 import "../../ha-config-section";
+import { computeRTL } from "../../../../common/util/compute_rtl";
 
 /*
  * @appliesMixin NavigateMixin
@@ -66,10 +67,14 @@ class CloudLogin extends LocalizeMixin(
         }
         .flash-msg ha-icon-button {
           position: absolute;
-          top: 8px;
+          top: 4px;
           right: 8px;
           color: var(--secondary-text-color);
         }
+        :host([rtl]) .flash-msg ha-icon-button {
+          right: auto;
+          left: 8px;
+        }
       </style>
       <hass-subpage header="[[localize('ui.panel.config.cloud.caption')]]">
         <div class="content">
@@ -191,6 +196,11 @@ class CloudLogin extends LocalizeMixin(
         type: String,
         notify: true,
       },
+      rtl: {
+        type: Boolean,
+        reflectToAttribute: true,
+        computed: "_computeRTL(hass)",
+      },
       _error: String,
     };
   }
@@ -306,6 +316,10 @@ class CloudLogin extends LocalizeMixin(
       this.flashMessage = "";
     }, 200);
   }
+
+  _computeRTL(hass) {
+    return computeRTL(hass);
+  }
 }
 
 customElements.define("cloud-login", CloudLogin);