diff --git a/nova/compute.sls b/nova/compute.sls
index efc8b0a..584dbe4 100644
--- a/nova/compute.sls
+++ b/nova/compute.sls
@@ -36,9 +36,9 @@
     - name: libvirtd
     - system: True
     - require_in:
-      - user: user_nova
+      - user: user_nova_compute
 
-user_nova:
+user_nova_compute:
   user.present:
   - name: nova
   - home: /var/lib/nova
@@ -61,13 +61,13 @@
     - file: /var/lib/nova/.ssh/id_rsa
     {%- endif %}
 
-group_nova:
+group_nova_compute:
   group.present:
     - name: nova
     - gid: 303
     - system: True
     - require_in:
-      - user: user_nova
+      - user: user_nova_compute
 {%- endif %}
 
 {%- if compute.user is defined %}
@@ -105,20 +105,20 @@
 {%- endif %}
 
 {%- if pillar.nova.controller is not defined %}
-
 /etc/nova/nova.conf:
   file.managed:
   - source: salt://nova/files/{{ compute.version }}/nova-compute.conf.{{ grains.os_family }}
   - template: jinja
+  - watch_in:
+    - service: nova_compute_services
   - require:
     - pkg: nova_compute_packages
+{%- endif %}
 
 nova_compute_services:
   service.running:
   - enable: true
   - names: {{ compute.services }}
-  - watch:
-    - file: /etc/nova/nova.conf
 
 {%- set ident = compute.identity %}
 
@@ -249,8 +249,6 @@
 
 {%- endif %}
 
-{%- endif %}
-
 {# temporary hack to fix broken init script in MOS 9.0 libvirt package #}
 
 {%- if compute.get('manage_init', False) and grains.init == 'upstart' %}
diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index c78117c..b13d4a8 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -3062,7 +3062,7 @@
                          {%- endfor -%}
                              /{{ compute.message_queue.virtual_host }}
 {%- else %}
-transport_url = rabbit://{{ compute.message_queue.user }}:{{ compute.message_queue.password }}@{{ compute.message_queue.host }}:{{ controller.message_queue.port }}{{ compute.message_queue.virtual_host }}
+transport_url = rabbit://{{ compute.message_queue.user }}:{{ compute.message_queue.password }}@{{ compute.message_queue.host }}:{{ compute.message_queue.port }}{{ compute.message_queue.virtual_host }}
 {%- endif %}
 
 rpc_backend=rabbit