Index: trunk/calendar3/calCore/resources/hbms/Preferences.hbm.xml
===================================================================
--- trunk/calendar3/calCore/resources/hbms/Preferences.hbm.xml (revision 2)
+++ trunk/calendar3/calCore/resources/hbms/Preferences.hbm.xml (revision 46)
@@ -21,5 +21,5 @@
                 class="org.bedework.calfacade.BwUser"
                 column="ownerid" not-null="true" unique="true"
-                index="viewowner" />
+                index="prefowner" />
 
     <set name="subscriptions" table="user_subscriptions" lazy="true"
@@ -40,6 +40,5 @@
 
     <many-to-one name="defaultCalendar"
-                 class="org.bedework.calfacade.BwCalendar"
-                 unique="true" >
+                 class="org.bedework.calfacade.BwCalendar" >
       <column name="default_calendarid" />
     </many-to-one>
Index: trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (revision 31)
+++ trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (revision 46)
@@ -1815,8 +1815,13 @@
 
       BwUser auth;
-      if (isPublicAdmin() || isGuest()) {
+// XXX      if (isPublicAdmin() || isGuest()) {
+      if (isGuest()) {
         auth = getPublicUser();
       } else {
         auth = cali.getUser(pars.getAuthUser());
+      }
+
+      if (debug) {
+        trace("Got auth user object " + auth);
       }
       dbi = new CalSvcDb(this, auth);
Index: trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcIPars.java
===================================================================
--- trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcIPars.java (revision 2)
+++ trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcIPars.java (revision 46)
@@ -205,4 +205,26 @@
   }
 
+  public String toString() {
+    StringBuffer sb = new StringBuffer("CalSvcIPars{");
+
+    sb.append("authUser=");
+    sb.append(getAuthUser());
+    sb.append(", rights=");
+    sb.append(getRights());
+    sb.append(", user=");
+    sb.append(getUser());
+    sb.append(", publicAdmin=");
+    sb.append(getPublicAdmin());
+    sb.append(", caldav=");
+    sb.append(getCaldav());
+    sb.append(", synchid=");
+    sb.append(getSynchId());
+    sb.append(", debug=");
+    sb.append(getDebug());
+    sb.append("}");
+
+    return sb.toString();
+  }
+
   public Object clone() {
     CalSvcIPars pars = new CalSvcIPars(getAuthUser(),