Index: /WAeUP_SRP/trunk/WAeUPTool.py
===================================================================
--- /WAeUP_SRP/trunk/WAeUPTool.py	(revision 5167)
+++ /WAeUP_SRP/trunk/WAeUPTool.py	(revision 5168)
@@ -1256,4 +1256,6 @@
         res = ZCatalog.searchResults(self.portal_catalog_real,portal_type="ScratchCardBatch")
         batch_doc = None
+        # Pick the first pin batch which the right prefix. This may cause problems if old maintenance fee batches exist. 
+        # They must be removed first.  
         for brain in res:
             if brain.id.startswith(info['maintenance_code']):
Index: /WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_edit_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_edit_form.pt	(revision 5167)
+++ /WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_edit_form.pt	(revision 5168)
@@ -33,5 +33,5 @@
         
         <ul tal:condition="python: mode == 'create' and not maintenance_online">
-                  <li>Buy a Hostel Application Scratch Card.</li> 
+            <li>Buy a Hostel Application Scratch Card.</li> 
             <li>Enter the PIN above and press 'Book'.</li>
             <li>Print your Hostel Allocation Slip.</li>
@@ -40,5 +40,5 @@
         <tal:block condition="python: mode == 'edit'" >
  
-           <ul tal:condition="not: maintenance_online" tal:omit-tag="">
+           <ul tal:condition="not: maintenance_online">
              <li>Buy a Hostel Maintenance Scratch Card 
                (Code: <span tal:replace="python: info['acco_doc'].acco_maint_code" />) for 
