diff --git a/setup.py b/setup.py
index 17e217a328..5c550bcd86 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20200623.1",
+    version="20200623.2",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",
diff --git a/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts b/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts
index 37a7d883de..17aef88705 100644
--- a/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts
+++ b/src/panels/config/integrations/integration-panels/mqtt/mqtt-config-panel.ts
@@ -15,6 +15,8 @@ import { haStyle } from "../../../../../resources/styles";
 import { HomeAssistant } from "../../../../../types";
 import "./mqtt-subscribe-card";
 import "../../../../../layouts/hass-subpage";
+import { showOptionsFlowDialog } from "../../../../../dialogs/config-flow/show-dialog-options-flow";
+import { getConfigEntries } from "../../../../../data/config_entries";
 
 @customElement("mqtt-config-panel")
 class HaPanelDevMqtt extends LitElement {
@@ -40,6 +42,13 @@ class HaPanelDevMqtt extends LitElement {
     return html`
       <hass-subpage>
         <div class="content">
+          <ha-card header="MQTT settings">
+            <div class="card-actions">
+              <mwc-button @click=${this._openOptionFlow}
+                >Re-configure MQTT</mwc-button
+              >
+            </div>
+          </ha-card>
           <ha-card
             header="${this.hass.localize(
               "ui.panel.config.mqtt.description_publish"
@@ -100,6 +109,19 @@ class HaPanelDevMqtt extends LitElement {
     });
   }
 
+  private async _openOptionFlow() {
+    const searchParams = new URLSearchParams(window.location.search);
+    if (!searchParams.has("config_entry")) {
+      return;
+    }
+    const configEntryId = searchParams.get("config_entry") as string;
+    const configEntries = await getConfigEntries(this.hass);
+    const configEntry = configEntries.find(
+      (entry) => entry.entry_id === configEntryId
+    );
+    showOptionsFlowDialog(this, configEntry!);
+  }
+
   static get styles(): CSSResultArray {
     return [
       haStyle,
@@ -116,7 +138,9 @@ class HaPanelDevMqtt extends LitElement {
           margin: 0 auto;
           direction: ltr;
         }
-
+        ha-card:first-child {
+          margin-bottom: 16px;
+        }
         mqtt-subscribe-card {
           display: block;
           margin: 16px auto;
diff --git a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts
index 7000ba3f75..67c0cc2a4d 100644
--- a/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts
+++ b/src/panels/config/integrations/integration-panels/zha/zha-config-dashboard.ts
@@ -56,19 +56,27 @@ class ZHAConfigDashboard extends LitElement {
       >
         <ha-card header="Zigbee Network">
           <div class="card-content">
-            Network info/settings for specific config entry
+            In the future you can change network settings for ZHA here.
           </div>
           ${this.configEntryId
             ? html`<div class="card-actions">
                 <a
                   href="${`/config/devices/dashboard?historyBack=1&config_entry=${this.configEntryId}`}"
                 >
-                  <mwc-button>Devices</mwc-button>
+                  <mwc-button
+                    >${this.hass.localize(
+                      "ui.panel.config.devices.caption"
+                    )}</mwc-button
+                  >
                 </a>
                 <a
                   href="${`/config/entities/dashboard?historyBack=1&config_entry=${this.configEntryId}`}"
                 >
-                  <mwc-button>Entities</mwc-button>
+                  <mwc-button
+                    >${this.hass.localize(
+                      "ui.panel.config.entities.caption"
+                    )}</mwc-button
+                  >
                 </a>
               </div>`
             : ""}