diff --git a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java
index ea1955db9..b3bc2fd31 100644
--- a/ccm-core/src/main/java/org/libreccm/core/CcmCore.java
+++ b/ccm-core/src/main/java/org/libreccm/core/CcmCore.java
@@ -25,6 +25,8 @@ import org.libreccm.core.modules.Module;
 import org.libreccm.core.modules.ShutdownEvent;
 import org.libreccm.core.modules.UnInstallEvent;
 
+import javax.persistence.EntityManager;
+
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@@ -49,7 +51,19 @@ public class CcmCore implements CcmModule {
 
     @Override
     public void install(final InstallEvent event) {
-        //Nothing
+        final EntityManager entityManager = event.getEntityManager();
+        
+        final User user = new User();
+        user.setScreenName("public-user");
+        final PersonName name = new PersonName();
+        name.setFamilyName("ccm");
+        name.setGivenName("public user");
+        user.setName(name);
+        final EmailAddress email = new EmailAddress();
+        email.setAddress("public-user@localhost");
+        user.addEmailAddress(email);
+        
+        entityManager.persist(user);
     }
 
     @Override
diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/CcmIntegrator.java b/ccm-core/src/main/java/org/libreccm/core/modules/CcmIntegrator.java
index 64755ce7b..933d78402 100644
--- a/ccm-core/src/main/java/org/libreccm/core/modules/CcmIntegrator.java
+++ b/ccm-core/src/main/java/org/libreccm/core/modules/CcmIntegrator.java
@@ -151,8 +151,9 @@ public class CcmIntegrator implements Integrator {
             final Statement statement = connection.createStatement();
             statement.execute(String.format(
                 "INSERT INTO flyhydra_core.installed_modules "
-                    + "(module_class_name, status) "
-                    + "VALUES ('%s', 'NEW')",
+                    + "(module_id, module_class_name, status) "
+                    + "VALUES (%d, %s', 'NEW')",
+                module.getName().hashCode(),
                 module.getName()));
         }
     }
diff --git a/ccm-core/src/main/java/org/libreccm/core/modules/InstalledModule.java b/ccm-core/src/main/java/org/libreccm/core/modules/InstalledModule.java
index df44c9e9d..652edf8b0 100644
--- a/ccm-core/src/main/java/org/libreccm/core/modules/InstalledModule.java
+++ b/ccm-core/src/main/java/org/libreccm/core/modules/InstalledModule.java
@@ -52,7 +52,7 @@ public class InstalledModule implements Serializable {
     @Column(name = "module_class_name", length = 2048, unique = true)
     private String moduleClassName;
 
-    @Column
+    @Column(name = "status")
     @Enumerated(EnumType.STRING)
     private ModuleStatus status;
 
diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
index 0b95c6893..a9ff2f14a 100644
--- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
+++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java
@@ -18,7 +18,6 @@
  */
 package org.libreccm.core;
 
-
 import static org.hamcrest.CoreMatchers.*;
 
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -93,10 +92,10 @@ public class CcmObjectRepositoryTest {
     @Deployment
     public static WebArchive createDeployment() {
         final PomEquippedResolveStage pom = Maven
-                .resolver()
-                .loadPomFromFile("pom.xml");
+            .resolver()
+            .loadPomFromFile("pom.xml");
         final PomEquippedResolveStage dependencies = pom
-                .importCompileAndRuntimeDependencies();
+            .importCompileAndRuntimeDependencies();
         final File[] libs = dependencies.resolve().withTransitivity().asFile();
 
         for (File lib : libs) {
@@ -105,26 +104,26 @@ public class CcmObjectRepositoryTest {
         }
 
         return ShrinkWrap
-                .create(WebArchive.class,
-                        "LibreCCM-org.libreccm.core.CcmObjectRepositoryTest.war").
-                addPackages(false, CcmObject.class.getPackage())
-                .addPackage(org.libreccm.web.Application.class.getPackage())
-                .addPackage(org.libreccm.categorization.Category.class.
-                        getPackage())
-                .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()).
-                addPackage(org.libreccm.jpa.EntityManagerProducer.class
-                        .getPackage())
-                .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class
-                        .getPackage())
-                .addPackage(org.libreccm.testutils.EqualsVerifier.class.
-                        getPackage())
-                .addPackage(org.libreccm.tests.categories.IntegrationTest.class
-                        .getPackage())
-                .addAsLibraries(libs)
-                .addAsResource("test-persistence.xml",
-                               "META-INF/persistence.xml")
-                .addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
+            .create(WebArchive.class,
+                    "LibreCCM-org.libreccm.core.CcmObjectRepositoryTest.war")
+            .addPackage(CcmObject.class.getPackage())
+            .addPackage(org.libreccm.web.Application.class.getPackage())
+            .addPackage(org.libreccm.categorization.Category.class.
+                getPackage())
+            .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()).
+            addPackage(org.libreccm.jpa.EntityManagerProducer.class
+                .getPackage())
+            .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class
+                .getPackage())
+            .addPackage(org.libreccm.testutils.EqualsVerifier.class.
+                getPackage())
+            .addPackage(org.libreccm.tests.categories.IntegrationTest.class
+                .getPackage())
+            .addAsLibraries(libs)
+            .addAsResource("test-persistence.xml",
+                           "META-INF/persistence.xml")
+            .addAsWebInfResource("test-web.xml", "WEB-INF/web.xml")
+            .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
     }
 
     @Test
@@ -141,7 +140,7 @@ public class CcmObjectRepositoryTest {
 
     @Test
     @UsingDataSet(
-            "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
+        "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
     @InSequence(3)
     public void datasetOnly() {
         System.out.println("Dataset loaded successfully.");
@@ -149,7 +148,7 @@ public class CcmObjectRepositoryTest {
 
     @Test
     @UsingDataSet(
-            "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml")
+        "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml")
     @InSequence(4)
     public void datasetOnly2() {
         System.out.println("Dataset loaded successfully.");
@@ -157,7 +156,7 @@ public class CcmObjectRepositoryTest {
 
     @Test
     @UsingDataSet(
-            "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
+        "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
     @InSequence(5)
     public void entityManagerFindCcmObjectByLongPrimitive() {
         final CcmObject obj1 = entityManager.find(CcmObject.class, -10L);
@@ -182,7 +181,7 @@ public class CcmObjectRepositoryTest {
 
     @Test
     @UsingDataSet(
-            "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
+        "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
     @InSequence(6)
     public void entityManagerFindCcmObjectByLongClass() {
         final CcmObject obj1 = entityManager.find(CcmObject.class,
@@ -211,7 +210,7 @@ public class CcmObjectRepositoryTest {
 
     @Test
     @UsingDataSet(
-            "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
+        "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
     @InSequence(10)
     public void findCcmObjectById() {
         final CcmObject obj1 = ccmObjectRepository.findById(-10L);
@@ -236,7 +235,7 @@ public class CcmObjectRepositoryTest {
 
     @Test
     @UsingDataSet(
-            "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
+        "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
     @InSequence(10)
     public void findAllCcmObjects() {
         final List<CcmObject> objects = ccmObjectRepository.findAll();
@@ -246,9 +245,9 @@ public class CcmObjectRepositoryTest {
 
     @Test
     @UsingDataSet(
-            "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
+        "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
     @ShouldMatchDataSet(value
-                        = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml",
+                            = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-new.yml",
                         excludeColumns = {"object_id"})
     @InSequence(300)
     public void saveNewCcmObject() {
@@ -260,9 +259,9 @@ public class CcmObjectRepositoryTest {
 
     @Test
     @UsingDataSet(
-            "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
+        "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
     @ShouldMatchDataSet(value
-                        = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml",
+                            = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-save-changed.yml",
                         excludeColumns = {"object_id"})
     @InSequence(400)
     public void saveChangedCcmObject() {
@@ -281,9 +280,9 @@ public class CcmObjectRepositoryTest {
 
     @Test
     @UsingDataSet(
-            "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
+        "datasets/org/libreccm/core/CcmObjectRepositoryTest/data.yml")
     @ShouldMatchDataSet(value
-                        = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml",
+                            = "datasets/org/libreccm/core/CcmObjectRepositoryTest/after-delete.yml",
                         excludeColumns = {"object_id"})
     @InSequence(600)
     public void deleteCcmObject() {