diff --git a/nova/_ssl/rabbitmq.sls b/nova/_ssl/rabbitmq.sls
index 8e236e6..0dc7c6e 100644
--- a/nova/_ssl/rabbitmq.sls
+++ b/nova/_ssl/rabbitmq.sls
@@ -1,6 +1,6 @@
 {% from "nova/map.jinja" import controller, compute with context %}
 
-{%- if controller.enabled == True %}
+{%- if controller.get('enabled') %}
   {%- set nova_msg = controller.message_queue %}
   {%- set nova_cacert = controller.cacert_file %}
   {%- set role = 'controller' %}
@@ -34,7 +34,7 @@
     - name: {{ ca_file }}
   {%- endif %}
 
-rabbitmq_nova_{{ role }}_ssl_cert:
+rabbitmq_nova_{{ role }}_client_ssl_cert:
   {%- if nova_msg.x509.cert is defined %}
   file.managed:
     - name: {{ cert_file }}