diff --git a/roles/xmpp_server/tasks/main.yml b/roles/xmpp_server/tasks/main.yml
index 540bfce0ba1f4b4f4cbb9402bf86575f84ae61f9..d53bc30f3cd9ed8c3e492881a8da5673eb77a3b1 100644
--- a/roles/xmpp_server/tasks/main.yml
+++ b/roles/xmpp_server/tasks/main.yml
@@ -98,7 +98,7 @@
 - name: Enable Prosody service on boot (workaround for systemctl broken handling of SysV)
   command: "rcconf -on prosody"
   register: result
-  changed_when: result.stderr == ""
+  changed_when: not result.stderr
 
 - name: Enable and start Prosody service
   service:
@@ -117,6 +117,6 @@
 
 - name: Explicitly run all handlers
   include: ../handlers/main.yml
-  when: "run_handlers | default(False) | bool() == True"
+  when: "run_handlers | default(False) | bool()"
   tags:
     - handlers