diff --git a/admin/availability.php b/admin/availability.php
index c170d6c9..0ab8e488 100644
--- a/admin/availability.php
+++ b/admin/availability.php
@@ -83,6 +83,12 @@ if (isset($_POST['day']))
 		}
 	}
 
+	$sql = "UPDATE availability_group
+		SET description = " . $db->qstr($_POST['description']) .  "
+		WHERE availability_group_id=  $availability_group";
+
+	$db->Execute($sql);
+
 	$db->CompleteTrans();
 }
 
@@ -109,6 +115,8 @@ $sql = "SELECT description
 
 $rs = $db->GetRow($sql);
 
+$description = $rs['description'];
+
 print "<h2>" . $rs['description'] . "</h2>";
 
 print "<h3>" . T_("Enter the start and end times for each day of the week to restrict calls within") . "</h3>";
@@ -149,10 +157,15 @@ translate_array($daysofweek,array("description"));
 
 ?>
 	</table>
-	<div><a onclick="addRow(); return false;" href="#"><?php  echo T_("Add row"); ?></a></div>
+	<p><a onclick="addRow(); return false;" href="#"><?php  echo T_("Add row"); ?></a></p>
+	<p><label for="description"><?php echo T_("Availability group name");  ?>: </label><input type="text" name="description" id="description" value="<?php echo $description;?>"/></p>
 	<p><input type="submit" name="submit" value="<?php  echo T_("Save changes to availabilities"); ?>"/></p>
 	<input type="hidden" name="availability_group" value="<?php  echo $availability_group;?>"/>
 	</form>
+	<form method="post" action="availabilitygroup.php">
+	<p><input type="submit" name="subdel" value="<?php  echo T_("Delete this availability group"); ?>"/></p>
+	<input type="hidden" name="availability_group" value="<?php  echo $availability_group;?>"/>
+	</form>
 <?php 
 	
 
diff --git a/admin/availabilitygroup.php b/admin/availabilitygroup.php
index 011f9d52..6415ce60 100644
--- a/admin/availabilitygroup.php
+++ b/admin/availabilitygroup.php
@@ -69,10 +69,32 @@ global $db;
 
 xhtml_head(T_("Availability groups"),true,array("../css/table.css"),array("../js/window.js"));
 
-
-if (isset($_GET['availability_group']))
+if (isset($_POST['subdel']))
 {
-	$availability_group = $db->qstr($_GET['availability_group']);
+	$availability_group = intval($_POST['availability_group']);
+
+	$db->StartTrans();
+
+	$sql = "DELETE FROM availability
+		WHERE availability_group_id = $availability_group";
+
+	$db->Execute($sql);
+
+	$sql = "DELETE FROM questionnaire_availability
+		WHERE availability_group_id = $availability_group";
+
+	$db->Execute($sql);
+
+	$sql = "DELETE FROM availability_group
+		WHERE availability_group_id = $availability_group";
+
+	$db->Execute($sql);
+
+	$db->CompleteTrans();
+}
+else if (isset($_POST['availability_group']))
+{
+	$availability_group = $db->qstr($_POST['availability_group']);
 	
 	$sql = "INSERT INTO `availability_group` (availability_group_id,description)
 		VALUES (NULL,$availability_group)";
@@ -97,10 +119,12 @@ else
 	xhtml_table($rs,array("description","link"),array(T_("Availablity group"),T_("Modify")));
 
 
-//add a note
+//add an availablity group
+print "<h3>" . T_("Add availability group") . "</h3>";
 ?>
-<form method="get" action="?">
-	<p><input type="text" class="textclass" name="availability_group" id="availability_group"/><input class="submitclass" type="submit" name="submit" value="<?php  echo T_("Add availability group"); ?>"/>
+<form method="post" action="?">
+	<p><label for="availability_group"><?php echo T_("Availability group name"); ?>: </label><input type="text" class="textclass" name="availability_group" id="availability_group"/></p>
+	<p><input class="submitclass" type="submit" name="submit" value="<?php  echo T_("Add availability group"); ?>"/>
 	</p>
 </form>
 <?php