diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileOwnerAssocUpgrade.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileOwnerAssocUpgrade.java
index 1166e3a47..507577e17 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileOwnerAssocUpgrade.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/contenttypes/PublicPersonalProfileOwnerAssocUpgrade.java
@@ -17,7 +17,8 @@ import org.apache.commons.cli.CommandLine;
  * ccm-cms from 6.6.4 to 6.6.5 has be executed before this update.
  *
  * @author Jens Pelzetter
- * @version $Id$
+ * @version $Id: PublicPersonalProfileOwnerAssocUpgrade.java 1501 2012-02-10
+ * 16:49:14Z jensp $
  */
 public class PublicPersonalProfileOwnerAssocUpgrade extends Program {
 
@@ -138,6 +139,11 @@ public class PublicPersonalProfileOwnerAssocUpgrade extends Program {
                         "INSERT INTO ct_public_personal_profile_bundles (bundle_id) "
                         + "VALUES (%d)",
                         profilesRs.getInt(1)));
+                stmt.addBatch(String.format(
+                        "UPDATE acs_objects "
+                        + "SET default_domain_class = 'com.arsdigita.cms.contenttypes.PublicPersonalProfileBundle' "
+                        + "WHERE object_id = %d",
+                        profilesRs.getInt(1)));
             }
 
             final List<String> processedEntries = new ArrayList<String>();
diff --git a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
index a85ed7c11..18edda1e3 100644
--- a/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
+++ b/ccm-cms-publicpersonalprofile/src/com/arsdigita/cms/publicpersonalprofile/PublicPersonalProfilesServlet.java
@@ -1148,7 +1148,7 @@ public class PublicPersonalProfilesServlet extends BaseApplicationServlet {
                 }*/
                 if (contentPage.getContentBundle().hasInstance(profile.
                         getLanguage(), false)) {
-                    contentPage = (ContentPage) contentPage.getContentBundle().
+                    item = (ContentPage) contentPage.getContentBundle().
                             getInstance(profile.getLanguage());
                 } else {
                     response.sendError(
diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContactPersonAssocUpgrade.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContactPersonAssocUpgrade.java
index 3ed2876ed..d6987ff08 100644
--- a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContactPersonAssocUpgrade.java
+++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericContactPersonAssocUpgrade.java
@@ -11,17 +11,17 @@ import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.commons.cli.CommandLine;
-import org.apache.log4j.Logger;
 
 /**
  * Upgrade for association between GenericContact and GenericPerson (6.6.4 to
  * 6.6.5)
  *
  * @author Jens Pelzetter
- * @version $Id$
+ * @version $Id: GenericContactPersonAssocUpgrade.java 1501 2012-02-10 16:49:14Z
+ * jensp $
  */
 public class GenericContactPersonAssocUpgrade extends Program {
-  
+
     public GenericContactPersonAssocUpgrade() {
         super("GenericContactPersonAssocUpgrade", "1.0.0", "");
     }
@@ -45,7 +45,7 @@ public class GenericContactPersonAssocUpgrade extends Program {
             printStackTrace(ex);
             close(conn);
             return;
-        }                            
+        }
 
         System.out.println("Retrieving old data...");
         try {
@@ -81,7 +81,7 @@ public class GenericContactPersonAssocUpgrade extends Program {
         try {
             System.out.println("Creating new tables...");
             final Statement stmt = conn.createStatement();
-            
+
             stmt.addBatch("CREATE TABLE cms_person_bundles ( "
                           + "bundle_id integer NOT NULL)");
 
@@ -153,6 +153,11 @@ public class GenericContactPersonAssocUpgrade extends Program {
                 stmt.addBatch(String.format("INSERT INTO cms_person_bundles (bundle_id) "
                                             + "VALUES (%d)",
                                             personsRs.getInt(1)));
+                stmt.addBatch(String.format(
+                        "UPDATE acs_objects "
+                        + "SET default_domain_class = 'com.arsdigita.cms.contenttypes.GenericPersonBundle' "
+                        + "WHERE object_id = %d",
+                        personsRs.getInt(1)));
             }
 
             final ResultSet contactsRs = queryContactsStmt.executeQuery(
@@ -165,10 +170,15 @@ public class GenericContactPersonAssocUpgrade extends Program {
                 stmt.addBatch(String.format("INSERT INTO cms_contact_bundles (bundle_id) "
                                             + "VALUES (%s)",
                                             contactsRs.getInt(1)));
+                stmt.addBatch(String.format(
+                        "UPDATE acs_objects "
+                        + "SET default_domain_class = 'com.arsdigita.cms.contenttypes.GenericContactBundle' "
+                        + "WHERE object_id = %d",
+                        contactsRs.getInt(1)));
             }
 
             final List<String> processedEntries =
-                         new ArrayList<String>();
+                               new ArrayList<String>();
             for (OldAssocEntry entry : oldData) {
                 BigDecimal personBundleId;
                 BigDecimal contactBundleId;
@@ -289,11 +299,11 @@ public class GenericContactPersonAssocUpgrade extends Program {
             printStackTrace(ex);
         }
     }
-    
+
     private void printStackTrace(final SQLException ex) {
         ex.printStackTrace(System.err);
         if (ex.getNextException() != null) {
             printStackTrace(ex.getNextException());
-        }        
+        }
     }
 }