diff --git a/CHANGELOG.md b/CHANGELOG.md
index da9acdf7..638d9649 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ The **patch** part changes incrementally at each release.
 * redis: Configure munin when working in instance mode
 
 ### Changed
+* redis: distinction between main and master password
 
 ### Fixed
 * nginx: Munin url config is now a template to insert the server-status prefix
diff --git a/redis/defaults/main.yml b/redis/defaults/main.yml
index 363fb0de..200d2ca2 100644
--- a/redis/defaults/main.yml
+++ b/redis/defaults/main.yml
@@ -8,7 +8,10 @@ redis_unixsocket: '/var/run/redis/redis.sock'
 redis_pidfile: "/var/run/redis/{{ redis_daemon }}.pid"
 redis_timeout: 300
 
+# for client authorization
 redis_password: NULL
+# for slave authorization on master
+redis_password_master: "{{ redis_password }}"
 
 redis_loglevel: "notice"
 redis_logfile: /var/log/redis/redis-server.log
diff --git a/redis/templates/redis.conf.j2 b/redis/templates/redis.conf.j2
index 21873942..a585d61c 100644
--- a/redis/templates/redis.conf.j2
+++ b/redis/templates/redis.conf.j2
@@ -9,7 +9,9 @@ unixsocket {{ redis_unixsocket }}
 
 {% if redis_password %}
 requirepass {{ redis_password }}
-masterauth {{ redis_password }}
+{% endif %}
+{% if redis_password_master %}
+masterauth {{ redis_password_master }}
 {% endif %}
 
 timeout {{ redis_timeout }}