Index: /WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py	(revision 1183)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getStudentWorkflowInfo.py	(revision 1184)
@@ -27,4 +27,9 @@
 #info['student'] = student
 info['url'] = student.absolute_url()
-info['review_state'] = wf.getInfoFor(student,'review_state',None)
+review_state = info['review_state'] = wf.getInfoFor(student,'review_state',None)
+info['returning'] = review_state in  ('returning',
+                                           'school_fee_pin_entered',
+                                           'courses_registered',
+                                           'courses_validated',
+                                           )
 return info
Index: /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt	(revision 1183)
+++ /WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt	(revision 1184)
@@ -3,16 +3,5 @@
            condition="context/isStudent">       
 
-<table class="registration" tal:condition="python:info and info['review_state'] in ('application_pin_entered',
-                                                                                     'admission_applied',
-                                                                                     'pume_passed',
-                                                                                     'pume_failed',
-                                                                                     'admitted',
-                                                                                     'admission_rejected',
-                                                                                     'objection_raised',
-                                                                                     'clearance_pin_entered',
-                                                                                     'clearance_requested',
-                                                                                     'cleared_and_validated',
-                                                                                     'deferred',
-                                                                                     )">
+<table class="registration" tal:condition="not:info/returning">
   <span tal:condition="python:path('info/review_state')=='application_pin_entered'">
   <tr><td class="active">
@@ -113,9 +102,5 @@
 </table>
 
-<table class="registration" tal:condition="python:info and info['review_state'] in ('returning',
-                                                                                    'school_fee_pin_entered',
-                                                                                    'courses_registered',
-                                                                                    'courses_validated',
-                                                                                    )">
+<table class="registration" tal:condition="info/returning">
   <span tal:condition="python:info['review_state']=='returning'">
   <tr><td class="active">
