diff --git a/grafana/files/grafana.ini b/grafana/files/grafana.ini
index 7a5b7c2..fb5f9c9 100644
--- a/grafana/files/grafana.ini
+++ b/grafana/files/grafana.ini
@@ -173,10 +173,12 @@ password = {{ server.database.password }}
 
 #################################### Auth Proxy ##########################
 [auth.proxy]
-;enabled = false
-;header_name = X-WEBAUTH-USER
-;header_property = username
+{%- if server.get('auth', {}).get('engine', None) == 'proxy' %}
+enabled = true
+header_name = {{ server.auth.get('header', 'X-REMOTE-USER') %}
+header_property = {{ server.auth.get('header_property', 'username') }}
 ;auto_sign_up = true
+{%- endif %}
 
 #################################### Basic Auth ##########################
 [auth.basic]