diff --git a/MANIFEST.in b/MANIFEST.in
index ab00d7e896..05136efef0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
 include README.md
 include esphomeyaml/dashboard/templates/index.html
+include esphomeyaml/dashboard/templates/login.html
 include esphomeyaml/dashboard/static/materialize-stepper.min.css
 include esphomeyaml/dashboard/static/materialize-stepper.min.js
diff --git a/esphomeyaml/dashboard/dashboard.py b/esphomeyaml/dashboard/dashboard.py
index 2733b7dc92..1c094d4e81 100644
--- a/esphomeyaml/dashboard/dashboard.py
+++ b/esphomeyaml/dashboard/dashboard.py
@@ -46,8 +46,8 @@ class BaseHandler(tornado.web.RequestHandler):
     def is_authenticated(self):
         has_cookie = self.get_secure_cookie('authenticated') == 'yes'
 
-        if ON_HASSIO:
-            return not USING_HASSIO_AUTH or has_cookie
+        if USING_HASSIO_AUTH:
+            return has_cookie
 
         return not USING_PASSWORD or has_cookie