diff --git a/cinder/volume.sls b/cinder/volume.sls
index 31b2af9..29f7ef6 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -1,8 +1,8 @@
 {%- from "cinder/map.jinja" import volume with context %}
 {%- if volume.enabled %}
 
-{%- if pillar.cinder.controller is not defined %}
-{%- set user = volume %} 
+{%- if not pillar.cinder.get('controller', {}).get('enabled', False) %}
+{%- set user = volume %}
 {%- include "cinder/user.sls" %}
 {%- endif %}