diff --git a/panels/config/cloud/ha-config-cloud-account.html b/panels/config/cloud/ha-config-cloud-account.html
index 937baafdcf..f8ab629b15 100644
--- a/panels/config/cloud/ha-config-cloud-account.html
+++ b/panels/config/cloud/ha-config-cloud-account.html
@@ -16,7 +16,7 @@
       paper-card {
         display: block;
       }
-      .account {
+      .account-row {
         display: flex;
         padding: 0 16px;
       }
@@ -28,6 +28,19 @@
         margin-top: 24px;
         text-align: center;
       }
+      .nowrap {
+        white-space: nowrap;;
+      }
+      .wrap {
+        white-space: normal;
+      }
+      .status {
+        padding: 16px;
+      }
+      paper-button {
+        color: var(--primary-color);
+        font-weight: 500;
+      }
     </style>
     <hass-subpage title='Cloud Account'>
       <div class='content'>
@@ -36,23 +49,29 @@
         >
           <span slot='header'>Home Assistant Cloud</span>
           <span slot='introduction'>
-            The Home Assistant Cloud allows you to opt-in to functions that will bring your Home Assistant experience to the next level.
-
-            <p><i>
-              Home Assistant will never share information with our cloud without your prior permission.
-            </i></p>
+            Thank you for supporting Home Assistant. It's because of people like you that we are able to run this project and make a great home automation experience for everyone. Thank you!
           </span>
 
           <paper-card>
-            <div class='account'>
-              <paper-item-body>
+            <div class='account-row'>
+              <paper-item-body two-line>
                 [[account.email]]
+                <div secondary class='wrap'>
+                  <span class='nowrap'>Subscription expires on </span>
+                  <span class='nowrap'>[[_formatExpiration(account.sub_exp)]]</span>
+                </div>
               </paper-item-body>
               <paper-button
-                class='warning'
                 on-tap='handleLogout'
               >Sign out</paper-button>
             </div>
+
+            <div class='account-row'>
+              <paper-item-body>
+                Cloud connection status
+              </paper-item-body>
+              <div class='status'>[[account.cloud]]</div>
+            </div>
           </paper-card>
 
           <div class='soon'>More configuration options coming soon.</div>
@@ -76,6 +95,10 @@ class HaConfigCloudAccount extends window.hassMixins.EventsMixin(Polymer.Element
   handleLogout() {
     this.hass.callApi('post', 'cloud/logout').then(() => this.fire('ha-account-refreshed', { account: null }));
   }
+
+  _formatExpiration(date) {
+    return window.hassUtil.formatDateTime(new Date(date));
+  }
 }
 
 customElements.define(HaConfigCloudAccount.is, HaConfigCloudAccount);
diff --git a/panels/config/cloud/ha-config-cloud-login.html b/panels/config/cloud/ha-config-cloud-login.html
index c862c690c7..5254ce89c5 100644
--- a/panels/config/cloud/ha-config-cloud-login.html
+++ b/panels/config/cloud/ha-config-cloud-login.html
@@ -46,11 +46,7 @@
         >
           <span slot='header'>Home Assistant Cloud</span>
           <span slot='introduction'>
-            The Home Assistant Cloud allows you to opt-in to functions that will bring your Home Assistant experience to the next level.
-
-            <p><i>
-              Home Assistant will never share information with our cloud without your prior permission.
-            </i></p>
+            The Home Assistant Cloud allows your local Home Assistant instance to connect with cloud-only services like Amazon Alexa.
           </span>
 
           <paper-card>
diff --git a/panels/config/cloud/ha-config-cloud-register.html b/panels/config/cloud/ha-config-cloud-register.html
index f038b19ae9..2e3cad92e3 100644
--- a/panels/config/cloud/ha-config-cloud-register.html
+++ b/panels/config/cloud/ha-config-cloud-register.html
@@ -11,6 +11,9 @@
 <dom-module id="ha-config-cloud-register">
   <template>
     <style include="iron-flex ha-style">
+      a {
+        color: var(--primary-color);
+      }
       paper-card {
         display: block;
       }
@@ -43,7 +46,7 @@
         >
           <span slot='header'>Register with the Home Assistant Cloud</span>
           <span slot='introduction'>
-            Register today to easily connect your Home Assistant to cloud-only services.
+            Register today to easily connect with the Home Assistant Cloud. This will allow you to unlock great new services and functionality, like Amazon Alexa integration.
 
             <p>
               By registering an account you agree to the following terms and conditions.
@@ -52,10 +55,6 @@
                 <li><a href='https://home-assistant.io/privacy/' target='_blank'>Privacy Policy</a></li>
               </ul>
             </p>
-
-            <p><i>
-              Home Assistant will never share information with our cloud without your prior permission.
-            </i></p>
           </span>
 
           <template is='dom-if' if='[[!_hasConfirmationCode]]'>