Index: trunk/calendar3/calCore/resources/hbms/Preferences.hbm.xml
===================================================================
--- trunk/calendar3/calCore/resources/hbms/Preferences.hbm.xml (revision 46)
+++ trunk/calendar3/calCore/resources/hbms/Preferences.hbm.xml (revision 86)
@@ -24,5 +24,6 @@
 
     <set name="subscriptions" table="user_subscriptions" lazy="true"
-         cascade="all-delete-orphan" >
+         cascade="all-delete-orphan"
+         sort="natural" >
       <cache usage="read-write"/>
       <key column="prefid"/>
@@ -31,5 +32,6 @@
 
     <set name="views" table="user_views" lazy="false"
-         cascade="all-delete-orphan" >
+         cascade="all-delete-orphan"
+         sort="natural" >
       <cache usage="read-write"/>
       <key column="prefid"/>
Index: trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java
===================================================================
--- trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (revision 55)
+++ trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (revision 86)
@@ -707,5 +707,5 @@
     sess.save(usercal);
 
-    sess.save(user);
+    sess.update(user);
   }
 
@@ -716,5 +716,5 @@
   public void updateUser(BwUser user) throws CalFacadeException {
     checkOpen();
-    sess.save(user);
+    sess.update(user);
   }
 
@@ -743,5 +743,5 @@
     val.setLogon(now);
     val.setLastAccess(now);
-    sess.saveOrUpdate(val);
+    sess.update(val);
   }
 
Index: trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (revision 68)
+++ trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (revision 86)
@@ -1433,5 +1433,5 @@
             // Assume deleted
             sub.setCalendarDeleted(true);
-            getCal().updateUser(getUser());
+            updateSubscription(sub);
           } else {
             sub.setCalendar(calendar);