diff --git a/esphomeyaml/components/i2c.py b/esphomeyaml/components/i2c.py
index 2a37613c9b..b5c216745a 100644
--- a/esphomeyaml/components/i2c.py
+++ b/esphomeyaml/components/i2c.py
@@ -13,8 +13,8 @@ I2CDevice = pins.I2CDevice
 
 CONFIG_SCHEMA = vol.Schema({
     cv.GenerateID(): cv.declare_variable_id(I2CComponent),
-    vol.Required(CONF_SDA, default='SDA'): pins.input_pullup_pin,
-    vol.Required(CONF_SCL, default='SCL'): pins.input_pullup_pin,
+    vol.Optional(CONF_SDA, default='SDA'): pins.input_pullup_pin,
+    vol.Optional(CONF_SCL, default='SCL'): pins.input_pullup_pin,
     vol.Optional(CONF_FREQUENCY): vol.All(cv.frequency, vol.Range(min=0, min_included=False)),
     vol.Optional(CONF_SCAN): cv.boolean,
 
diff --git a/esphomeyaml/dashboard/templates/index.html b/esphomeyaml/dashboard/templates/index.html
index 31ad8037f5..21c93c1b73 100644
--- a/esphomeyaml/dashboard/templates/index.html
+++ b/esphomeyaml/dashboard/templates/index.html
@@ -463,8 +463,15 @@
                 (leave them empty if you're not using any authentication).
               </p>
             {% else %}
+              <p>
+                esphomelib connects to your Home Assistant instance via
+                <a href="https://www.home-assistant.io/docs/mqtt/">MQTT</a>. In this section you will have
+                to tell esphomelib which MQTT "broker" to use.
+
+              </p>
               <p>
                 It looks like you've already set up MQTT, the values below are taken from your HassIO MQTT add-on.
+                Please confirm they are correct and press CONTINUE.
               </p>
             {% end %}
             <div class="input-field col s12">