diff -r 83f4fab7c556 -r 1d27ec29f1c7 app/soc/views/helper/templatetags/forms_helpers.py
--- a/app/soc/views/helper/templatetags/forms_helpers.py	Wed Apr 08 22:20:33 2009 +0000
+++ b/app/soc/views/helper/templatetags/forms_helpers.py	Wed Apr 08 22:20:53 2009 +0000
@@ -331,6 +331,10 @@
       if '__scoped__' in filter:
         args['scope_path'] = entity.key().name()
 
+      # TODO: replace this hack needed to get org-scoped mentor autocompletion on student proposals
+      if '__org__' in filter:
+        args['scope_path'] = entity.org.key().name()
+
       params['args'] = '&'.join(['%s=%s' % item for item in args.iteritems()])
 
     select_url = redirects.getSelectRedirect(params)