Index: /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py
===================================================================
--- /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py	(revision 15640)
+++ /main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py	(revision 15641)
@@ -210,8 +210,10 @@
 
     def dataNotComplete(self, data):
-        if self._student_per_school_exceeded(data):
-            return ("1st Choice TPZ and School: "
-                    "Maximum number of applications per school exceeded. "
-                    "Please select another first choice school.")
+        target = getattr(self.context.__parent__, 'prefix', None)
+        if target == 'tpu':
+            if self._student_per_school_exceeded(data):
+                return ("1st Choice TPZ and School: "
+                        "Maximum number of applications per school exceeded. "
+                        "Please select another first choice school.")
         super(CustomApplicantEditFormPage, self).dataNotComplete(data)
         return
