Index: trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.postinst
===================================================================
--- trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.postinst	(revision 294)
+++ trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.postinst	(revision 295)
@@ -21,9 +21,11 @@
 case "$1" in
     configure)
-        # Don't fail if the user/database already exists
-        su postgres -c 'createuser sipb-xen -S -d -R'    || true
-        su postgres -c 'createdb sipb_xen -O sipb-xen'   || true
-        adduser --system sipb-xen
-
+        #Don't create users on upgrade
+        if [ -z "$2" ]; then
+            # Don't fail if the user/database already exists
+            su postgres -c 'createuser sipb-xen -S -d -R'    || true
+            su postgres -c 'createdb sipb_xen -O sipb-xen'   || true
+            adduser --system sipb-xen
+        fi
         su sipb-xen -s /bin/sh -c 'sipb-xen-database-tables create'
     ;;
Index: trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.prerm
===================================================================
--- trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.prerm	(revision 294)
+++ trunk/packages/sipb-xen-database/sipb-xen-database/debian/sipb-xen-database-server.prerm	(revision 295)
@@ -19,5 +19,5 @@
 
 case "$1" in
-    remove|upgrade|deconfigure)
+    remove|deconfigure)
 
         # This will destroy data -- do we want to do this?
@@ -27,5 +27,5 @@
     ;;
 
-    failed-upgrade)
+    upgrade|failed-upgrade)
     ;;