diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertyForm.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertyForm.java
index 9a46d0131..6ab2f7dad 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertyForm.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentPropertyForm.java
@@ -27,6 +27,7 @@ import com.arsdigita.bebop.event.FormProcessListener;
 import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.form.TextArea;
 import com.arsdigita.bebop.parameters.ParameterModel;
+import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.SciDepartment;
@@ -64,6 +65,7 @@ public class SciDepartmentPropertyForm
         ParameterModel descParam = new StringParameter(
                 SciDepartment.DEPARTMENT_SHORT_DESCRIPTION);
         TextArea desc = new TextArea(descParam);
+        desc.addValidationListener(new StringInRangeValidationListener(0, 500));
         desc.setCols(75);
         desc.setRows(5);
         add(desc);
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPropertyForm.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPropertyForm.java
index 4c877c57e..37e17077a 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPropertyForm.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciOrganizationPropertyForm.java
@@ -28,6 +28,7 @@ import com.arsdigita.bebop.event.FormSectionEvent;
 import com.arsdigita.bebop.event.FormSubmissionListener;
 import com.arsdigita.bebop.form.TextArea;
 import com.arsdigita.bebop.parameters.ParameterModel;
+import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.SciOrganization;
@@ -65,6 +66,7 @@ public class SciOrganizationPropertyForm
         ParameterModel descParam = new StringParameter(
                 SciOrganization.ORGANIZATION_SHORT_DESCRIPTION);
         TextArea desc = new TextArea(descParam);
+        desc.addValidationListener(new StringInRangeValidationListener(0, 500));
         desc.setCols(75);
         desc.setRows(5);
         add(desc);
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertyForm.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertyForm.java
index c1286c565..89ecfec5a 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertyForm.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertyForm.java
@@ -30,6 +30,7 @@ import com.arsdigita.bebop.form.Date;
 import com.arsdigita.bebop.form.TextArea;
 import com.arsdigita.bebop.parameters.DateParameter;
 import com.arsdigita.bebop.parameters.ParameterModel;
+import com.arsdigita.bebop.parameters.StringInRangeValidationListener;
 import com.arsdigita.bebop.parameters.StringParameter;
 import com.arsdigita.cms.ItemSelectionModel;
 import com.arsdigita.cms.contenttypes.SciProject;
@@ -83,6 +84,7 @@ public class SciProjectPropertyForm
         ParameterModel shortDescParam = new StringParameter(
                 SciProject.PROJECT_SHORT_DESCRIPTION);
         TextArea shortDesc = new TextArea(shortDescParam);
+        shortDesc.addValidationListener(new StringInRangeValidationListener(0, 500));
         shortDesc.setCols(75);
         shortDesc.setRows(5);
         add(shortDesc);
diff --git a/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganization-index.jsp b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganization-index.jsp
index 472957786..e70bbfed4 100644
--- a/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganization-index.jsp
+++ b/ccm-zes-aplaws/web/packages/navigation/templates/SciOrganization-index.jsp
@@ -24,7 +24,7 @@
     <define:component name="greetingItem"
       classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
     <define:component name="sectionXML"
-      classname="com.arsdigita.cms.contenttypes.ui.SciDepartmentPanel"/>
+      classname="com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel"/>
     <jsp:scriptlet>
         com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
         ((com.arsdigita.cms.contenttypes.ui.SciOrganizationPanel) sectionXML).setContentItem(item);