diff --git a/roles/network/tasks/restart.yml b/roles/network/tasks/restart.yml
index 5fe64f8fc..6660e60fe 100644
--- a/roles/network/tasks/restart.yml
+++ b/roles/network/tasks/restart.yml
@@ -1,7 +1,6 @@
 - name: restart hostapd when wifi is present
   service: name=hostapd state=started
   when: iiab_wireless_lan_iface != "none" and hostapd_enabled
-#  when: iiab_wireless_lan_iface != "none" and hostapd_enabled and iiab_network_mode != "Appliance"
 
 - name: Start named service
   service: name={{ dns_service }}
@@ -18,10 +17,10 @@
            state=stopped
   when: squid_install
 
-- name: Restart DansGuardian
+- name: Restart DansGuardian - execpt Ubuntu which needs reboot to activate
   service: name=dansguardian
            state=restarted
-  when: dansguardian_enabled and dansguardian_install
+  when: dansguardian_enabled and dansguardian_install and ( not is_ubuntu and iiab_stage|int < 4 )
 
 # Squid get re-loaded with dispatcher.d
 - name: Restart Squid service