Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation_fe.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation_fe.xml	(revision 1315)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_accommodation_fe.xml	(revision 1316)
@@ -20,5 +20,4 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="view_format">medium</property>
  </widget>
  <widget name="acco_maint_sc_pin" meta_type="Scratchcard Pin Widget">
@@ -50,5 +49,4 @@
   </property>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="view_format">medium</property>
  </widget>
  <widget name="acco_res_sc_pin" meta_type="Scratchcard Pin Widget">
@@ -57,5 +55,4 @@
    <element value="acco_res_sc_pin"/>
   </property>
-  <property name="is_required">False</property>
   <property name="label">Access Code</property>
   <property name="label_edit">Access Code</property>
@@ -115,7 +112,4 @@
  <table>
   <row>
-   <cell name="session"/>
-  </row>
-  <row>
    <cell name="bed"/>
   </row>
Index: /WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py	(revision 1315)
+++ /WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py	(revision 1316)
@@ -67,5 +67,5 @@
 Email Address in Personal Data: %s
 Date of Birth: %s
-Password: %s
+Password: '%s'
 
 """
@@ -82,5 +82,5 @@
         )
 else:
-	
+
     info['student'] = student
     info['id'] = student_id
@@ -104,8 +104,8 @@
         info['password']
         )
-	
-	
-	
-	            
+
+
+
+
 
 return info
Index: /WAeUP_SRP/trunk/skins/waeup_student/layout_student_acco_view_slip.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/layout_student_acco_view_slip.pt	(revision 1315)
+++ /WAeUP_SRP/trunk/skins/waeup_student/layout_student_acco_view_slip.pt	(revision 1316)
@@ -5,6 +5,5 @@
               dm options/datastructure/getDataModel;
               widgets python:context.getRenderedWidgets(layout);
-              fields python:('session',
-                                 'bed',
+              fields python:('bed',
                                  'acco_res_sc_pin',
                                  'acco_res_date',
Index: /WAeUP_SRP/trunk/skins/waeup_utilities/deleteStudentByMatricNo.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_utilities/deleteStudentByMatricNo.py	(revision 1315)
+++ /WAeUP_SRP/trunk/skins/waeup_utilities/deleteStudentByMatricNo.py	(revision 1316)
@@ -25,5 +25,5 @@
 students = context.portal_url.getPortalObject().campus.students
 if str(member) not in ('admin','joachim') or matric_no is None:
-    return 
+    return
 res = st_cat(matric_no=matric_no)
 if len(res) != 1:
@@ -51,19 +51,19 @@
     msg = "%s deleted" % (','.join(res_deleted))
 else:
-    msg = "no results to delete for %s" % matric_no
+    msg = "No results to delete for %s" % matric_no
 output.append(msg)
 logger.info(msg)
 if hasattr(stdir, student_id):
     stdir.deleteEntry(student_id)
-    msg = "Student Directoryentry for %s deleted" % student_id
+    msg = "Student directory entry for %s deleted" % student_id
 else:
-    msg = "No Student Directoryentry for %s" % student_id
+    msg = "No Student directory entry for %s" % student_id
 output.append(msg)
 logger.info(msg)
 if hasattr(students,student_id):
     students.manage_delObjects((student_id),)
-    msg = "students entry for %s deleted" % student_id
+    msg = "Student object for %s deleted" % student_id
 else:
-    msg = "No students entry for %s" % student_id
+    msg = "No students object for %s" % student_id
 output.append(msg)
 logger.info(msg)
