diff --git a/hooks/rabbitmq-common b/hooks/rabbitmq-common
index 52236411..540e670f 100755
--- a/hooks/rabbitmq-common
+++ b/hooks/rabbitmq-common
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 RABBIT_CTL='rabbitmqctl'
-PASSWD_FILE="/var/run/ensemble/$RABBIT_USER.passwd"
 HOSTNAME=`hostname -f`
+
 function user_exists {
   $RABBIT_CTL list_users | grep $1 >/dev/null
 }
diff --git a/hooks/rabbitmq-relations b/hooks/rabbitmq-relations
index 6ec4e2fd..b3b7ebeb 100755
--- a/hooks/rabbitmq-relations
+++ b/hooks/rabbitmq-relations
@@ -3,17 +3,24 @@ set -u
 FORMULA_DIR=$(dirname $0)
 ARG0=${0##*/}
 
+if [[ -e $FORMULA_DIR/rabbitmq-common ]] ; then
+  . $FORMULA_DIR/rabbitmq-common
+else
+  ensemble-log "rabbitmq: ERROR Could not load $FORMULA_DIR/rabbitmq-common"
+  exit 1
+fi
+
 ensemble-log "rabbitmq: Firing hook $ARG0."
 
-DEFAULT_ETH=$(ip route  | grep default | awk '{ print $5 }')
-IP=$(ifconfig  $DEFAULT_ETH | grep 'inet addr' | awk '{ print $2 }' | cut -d: -f2)
-
-
 function install_hook() {
+  DEFAULT_ETH=$(ip route  | grep default | awk '{ print $5 }')
+  IP=$(ifconfig  $DEFAULT_ETH | grep 'inet addr' | awk '{ print $2 }' | cut -d: -f2)
+
   if ! cat /etc/hosts | grep "$IP $HOSTNAME" >>/dev/null; then
     echo "Updating /etc/hosts"
     echo $IP $HOSTNAME >> /etc/hosts
   fi
+
   [[ ! `which pwgen` ]] && apt-get -y install pwgen
   apt-get -y install rabbitmq-server
   rc=$?
@@ -23,6 +30,7 @@ function install_hook() {
 function amqp_changed() {
   RABBIT_USER=`relation-get username`
   [[ -z $RABBIT_USER ]] && exit 0
+  PASSWD_FILE="/var/run/ensemble/$RABBIT_USER.passwd"
   if [[ -e $PASSWD_FILE ]] ; then
     PASSWORD=$(cat $PASSWD_FILE)
   else
diff --git a/metadata.yaml b/metadata.yaml
index 1d892750..a5e30fe7 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,6 +1,6 @@
 ensemble: formula
 name: rabbitmq
-revision: 19
+revision: 24
 summary:  "An AMQP server written in Erlang"
 description: |
  RabbitMQ is an implementation of AMQP, the emerging standard for high