diff --git a/tasks/configure/mta.yml b/tasks/configure/mta.yml
index 3800005..f23328b 100644
--- a/tasks/configure/mta.yml
+++ b/tasks/configure/mta.yml
@@ -54,12 +54,14 @@
     owner: root
     group: root
     mode: 0644
+  when: zimbra_policyd == 'y'
 
 - name: Configuring PolicyD Web Interface
   file:
     src: /opt/zimbra/common/share/webui
     dest: /opt/zimbra/data/httpd/htdocs/webui
     state: link
+  when: zimbra_policyd == 'y'
 
 - name: Enable PolicyD Web Interface
   lineinfile:
@@ -67,3 +69,4 @@
     regexp: "^    DirectoryIndex index.html index.html.var"
     line: "    DirectoryIndex index.html index.html.var index.php"
     state: present
+  when: zimbra_policyd == 'y'
diff --git a/tasks/main.yml b/tasks/main.yml
index f40f36a..9249e78 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -17,7 +17,7 @@
 - include: 'install/zimbra.yml'
   when: getent_passwd.rc == 2
 - include: 'install/policyd.yml'
-  when: getent_passwd.rc == 2 and zimbra-policyd == 'y'
+  when: getent_passwd.rc == 2 and zimbra_policyd == 'y'
 
 #
 # Configuration process