Index: /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/browser.py
===================================================================
--- /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/browser.py	(revision 15843)
+++ /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/applicants/browser.py	(revision 15844)
@@ -192,5 +192,6 @@
 
     def update(self):
-        if not self.context.r_company:
+        if not self.context.p_state in ('waived', 'scholarship') \
+            and not self.context.r_company:
             self.redirect(self.url(self.context))
             return
Index: /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py
===================================================================
--- /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py	(revision 15843)
+++ /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py	(revision 15844)
@@ -217,5 +217,6 @@
 
     def update(self):
-        if not self.context.r_company:
+        if not self.context.p_state in ('waived', 'scholarship') \
+            and not self.context.r_company:
             self.redirect(self.url(self.context))
             return
