diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index 57ec0e9b46..aa221e8f0b 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -29,16 +29,16 @@
   notify:
   - "restart openvpn {{ ansible_distribution_version[0] }}"
 
-- name: enable openvpn service for rhel 6 or Fedora
+- name: enable openvpn service for rhel 6
   service: name=openvpn state=running enabled=true
-  when: ansible_distribution_version[0] == 6 or is_fedora is defined
+  when: ansible_distribution_version[0] == 6
   tags:
   - service
   - openvpn
 
-- name: enable openvpn service for rhel 7
+- name: enable openvpn service for rhel 7 or Fedora
   service: name=openvpn@openvpn state=running enabled=true
-  when: ansible_distribution_version[0] == 7
+  when: ansible_distribution_version[0] == 7 or is_fedora is defined
   tags:
   - service
   - openvpn