diff --git a/TODO.pep b/TODO.pep
new file mode 100644
index 000000000..5ff51f706
--- /dev/null
+++ b/TODO.pep
@@ -0,0 +1,5 @@
+• configure access model when changing it in the combobox
+• tab in preferences for PEP
+• PEP in status change
+• possible transport of Mood in message
+• Tune not set to none on connection
diff --git a/data/glade/manage_pep_services_window.glade b/data/glade/manage_pep_services_window.glade
index d9812ff07..a3e5e6155 100644
--- a/data/glade/manage_pep_services_window.glade
+++ b/data/glade/manage_pep_services_window.glade
@@ -65,6 +65,34 @@
 	  <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
 	  <property name="spacing">0</property>
 
+	  <child>
+	    <widget class="GtkButton" id="add_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-add</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	      <signal name="clicked" handler="on_add_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:57:55 GMT"/>
+	    </widget>
+	  </child>
+	  <child>
+	    <widget class="GtkButton" id="delete_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-delete</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	      <signal name="clicked" handler="on_delete_button_clicked" last_modification_time="Sat, 31 Mar 2007 07:57:55 GMT"/>
+	    </widget>
+	  </child>
 	  <child>
 	    <widget class="GtkButton" id="cancel_button">
 	      <property name="visible">True</property>
diff --git a/src/config.py b/src/config.py
index c54fedf14..f3f329c41 100644
--- a/src/config.py
+++ b/src/config.py
@@ -3476,7 +3476,6 @@ class ManagePEPServicesWindow:
 		model.append(['presence'])
 		model.append(['roster'])
 		model.append(['whitelist'])
-		model.append(['delete'])
 		cellrenderer_combo = gtk.CellRendererCombo()
 		cellrenderer_combo.set_property('text-column', 0)
 		cellrenderer_combo.set_property('model', model)