diff --git a/ceilometer/agent.sls b/ceilometer/agent.sls
index 72bbfad..2e075a8 100644
--- a/ceilometer/agent.sls
+++ b/ceilometer/agent.sls
@@ -15,11 +15,11 @@
   - require:
     - pkg: ceilometer_agent_packages
 
-{%- if agent.get('libvirt',{}).get('ssl',{}).get('enabled', False) == True  and salt['group.info']('nova') %}
+{%- if agent.get('libvirt',{}).get('ssl',{}).get('enabled', False) == True %}
 add_ceilometer_to_nova_group:
   user.present:
   - name: ceilometer
-  - groups:
+  - optional_groups:
     - nova
   - require:
     - pkg: ceilometer_agent_packages