diff --git a/ccm-cms-types-organization/src/ccm-cms-types-organization.config b/ccm-cms-types-organization/src/ccm-cms-types-organization.config
index adfdba100..ae3b34f20 100755
--- a/ccm-cms-types-organization/src/ccm-cms-types-organization.config
+++ b/ccm-cms-types-organization/src/ccm-cms-types-organization.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <registry>
-  <!-- nothing yet -->
+  <config class="com.arsdigita.cms.contenttypes.SciOrganizationConfig"
+	  storage="ccm-sci-types-organization/SciOrganization.properties"/>
 </registry>
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java
index ceab14099..dfac5b1ea 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java
@@ -22,6 +22,7 @@ package com.arsdigita.cms.contenttypes.ui;
 import com.arsdigita.bebop.Component;
 import com.arsdigita.bebop.Label;
 import com.arsdigita.cms.ContentType;
+import com.arsdigita.cms.ContentTypeCollection;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.SciOrganizationConfig;
 import com.arsdigita.cms.contenttypes.SciProject;
@@ -137,9 +138,12 @@ public class SciProjectPropertiesStep
                     "sciorganization.ui.project.departments"));
         }
 
+        ContentTypeCollection contentTypes = ContentType.getAllContentTypes();
+        contentTypes.addFilter("associatedObjectType = :type").set(
+                "type",
+                "com.arsdigita.cms.contenttypes.Publication");
         if ((!config.getProjectMaterialsHide())
-            && ContentType.findByAssociatedObjectType(
-                "com.arsdigita.cms.contenttypes.Publication") != null) {
+            && (contentTypes.size() > 0)) {
             /*
              * Must add this step manually since the basic class is not
              * SimpleEditStep...