diff --git a/defaults/main.yml b/defaults/main.yml
index 14ad003..074d53e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,7 +3,7 @@
 grafana_auth_anonymous_enabled: true
 grafana_auth_anonymous_org_role: Editor # Viewer
 grafana_auth_anonymous_org_name: 'Main Org.'
-grafana_auth_disable_login_form: true
+grafana_auth_disable_login_form: false
 grafana_editors_can_admin: false
 grafana_users_viewers_can_edit: false
 grafana_log_level: error
diff --git a/templates/compose/traefik.yml.j2 b/templates/compose/traefik.yml.j2
index 4c58884..4a9ea6b 100644
--- a/templates/compose/traefik.yml.j2
+++ b/templates/compose/traefik.yml.j2
@@ -36,6 +36,7 @@ services:
       traefik.http.routers.dashboard.rule: Host(`{{ traefik_domain }}`) && (PathPrefix(`/api`) || PathPrefix(`/dashboard`))
 {% if traefik_ipwhitelist is defined %}
       traefik.http.middlewares.clientips.ipwhitelist.sourcerange: {{ traefik_ipwhitelist }}
+	  traefik.http.routers.traefik.middlewares: "clientips@docker"
 {% endif %}
       traefik.http.middlewares.auth.basicauth.users: "ludal:$$apr1$$N3vklVTY$$zrq2kwkaVdynGlakyb4J7."
       traefik.http.middlewares.auth.basicauth.realm: {{ traefik_domain }} - restricted access