diff --git a/tasks/php.yml b/tasks/php.yml
index b6aadec188ab408d0b71a8fd5c11dd2bd6656bf9..11f727fd12541a97d1be41400eb41f7af3494fc6 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -30,7 +30,8 @@
     state=present
   with_items:
     - fcgid
-  notify: "Apache | Restart Apache"
+  when: not php_called_from_apache
+  notify: "PHP | Restart Apache"
 
 - name: "PHP | Configuration file, php.ini"
   template:
@@ -39,6 +40,7 @@
     owner=root
     group=root
     mode=0644
+  when: not php_called_from_apache
   notify:
     - "PHP | Restart Apache"
 
@@ -49,6 +51,7 @@
     owner=root
     group=root
     mode=0644
+  when: not php_called_from_apache
   notify:
     - "PHP | Restart Apache"
 
@@ -81,7 +84,7 @@
     dest=/etc/php5/apache2/extra/browscap.ini
     owner=root
     group=root
-  when: php_browscap
+  when: not php_called_from_apache and php_browscap
   notify:
     - "PHP | Restart Apache"