Index: /WAeUP_SRP/trunk/Students.py
===================================================================
--- /WAeUP_SRP/trunk/Students.py	(revision 1447)
+++ /WAeUP_SRP/trunk/Students.py	(revision 1448)
@@ -1156,4 +1156,7 @@
                 no_certificate = "no certificate %s" % format
             course_id = result.get('CosCode')
+            if not course_id:
+                course_id = 'N/A'
+                result['CosCode'] = course_id
             matric_no = result.get('matric_no').upper()
             result['matric_no'] = matric_no
Index: /WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py	(revision 1447)
+++ /WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py	(revision 1448)
@@ -63,5 +63,7 @@
     if with_courses_cat:
         res = context.courses_catalog(code = r.CosCode)
-    if with_courses_cat and res:
+    if r.CosCode == 'N/A':
+        result['title'] = 'N/A'
+    elif with_courses_cat and res:
         result['title'] = res[0].title
     else:
Index: /WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py	(revision 1447)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py	(revision 1448)
@@ -87,5 +87,5 @@
     info['review_state'] = wf.getInfoFor(student,'review_state',None)
     info['password'] = context.waeup_tool.getCredential(student_id)
-    info['email'] = 'na'
+    info['email'] = 'N/A'
 
     msg="""
@@ -100,5 +100,5 @@
 
     info['message'] = msg % (
-        'na',
+        'N/A',
         student_id,
         info['password']
Index: /WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py	(revision 1447)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py	(revision 1448)
@@ -43,5 +43,5 @@
 res = scatalog(id = student_id)
 matric_no = res[0].matric_no
-student_from_cat = res[0] 
+student_from_cat = res[0]
 
 res = returning(matric_no = matric_no)
@@ -83,9 +83,11 @@
             result['gpa'] = 'ok'
         except:
-            result['gpa'] = 'na'
+            result['gpa'] = 'N/A'
     else:
-        result['title'] = "na"
-        result['credits'] = "na"
-        result['gpa'] = 'na'
+        result['title'] = ""
+        result['credits'] = "N/A"
+        result['gpa'] = 'N/A'
+        result['WEIGHT'] = 'N/A'
+        result['GRADE'] = 'N/A'
     if r.Semester == '2':
         sem2.append(result)
@@ -102,7 +104,7 @@
         info['sex'] = 'M'
     info['level'] = int(student_from_cat.level)-100
-else: 
-    info['sex'] = 'na'
-    info['level'] = 'na'
+else:
+    info['sex'] = 'N/A'
+    info['level'] = 'N/A'
 
 info['verdict'] = verdict
Index: /WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt	(revision 1447)
+++ /WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt	(revision 1448)
@@ -61,5 +61,5 @@
           </td>
         </tr>
-        <tr tal:condition="python: info['email'] and info['email']!='na'">
+        <tr tal:condition="python: info['email'] and info['email']!='N/A'">
           <td>&nbsp;</td>
           <td><input name="Submit" type="submit" class="standalone" value="Submit" /><br /><br /></td>
