Index: /main/waeup.sirp/trunk/src/waeup/sirp/hostels/hostel.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/hostels/hostel.py	(revision 6997)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/hostels/hostel.py	(revision 6998)
@@ -59,4 +59,7 @@
                 self._p_changed = True
                 removed_counter += 1
+            else:
+                self[key].bed_number = 9999
+        remaining = len(keys) - removed_counter
 
         blocks_for_female = getattr(self,'blocks_for_female',[])
@@ -94,4 +97,7 @@
                         if self.has_key(uid):
                             bed = self[uid]
+                            # Renumber remaining beds
+                            bed.bed_number = len(self) + 1 - remaining
+                            remaining -= 1
                             if bed.bed_type != bt:
                                 bed.bed_type = bt
@@ -102,5 +108,5 @@
                             bed.bed_id = uid
                             bed.bed_type = bt
-                            bed.bed_number = len(self) + 1
+                            bed.bed_number = len(self) + 1 - remaining
                             bed.owner = NOT_OCCUPIED
                             self.addBed(bed)
@@ -122,6 +128,9 @@
 
     def bookBed(self, student_id):
-        self.owner = student_id
-        return
+        if self.owner == NOT_OCCUPIED:
+            self.owner = student_id
+            return None
+        else:
+            return self.owner
 
     def switchReservation(self):
