diff --git a/ChangeLog b/ChangeLog
index 79ed95609..2fcb6338f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-25  Raphael Ackermann <raphael.ackermann@gmail.com>
+	* src/plugins/GrampsCfg.py: new (GrampsPreferences.update_idformat_entry):
+	add method that sets new ID format preferences in db. 
+	(GrampsPreferences.add_prefix_panel): use callback update_idformat.entry 
+	0001817: Make preference changes take immediate effect. 
+	* po/POTFILES.in: add DateParserDisplayTest.py. #0001819
+
 2008-02-25 Douglas S. Blank <dblank@cs.brynmawr.edu>
 	* src/gen/lib/test/date_test.py: new slash date tests
 	* src/gen/lib/date.py: new get_slash(), fix slash conversions
diff --git a/po/ChangeLog b/po/ChangeLog
index 9ae3da77a..52afb15ed 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,8 @@
+2008-02-25 Raphael Ackermann <raphael.ackermann@gmail.com>
+	* POTFILES.in : add missing plugins/DateParserDisplayTest.py #0001819
+
 2008-02-23 Bernard Banko <bernard.banko@siol.net>
-        * sl.po: Translation update
+	* sl.po: Translation update
 
 2008-02-22 Frederik De Richter <frederik.de.richter@pandora.be>
 	* gramps.pot: update to include manual strings
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 79ed5c4b4..91a1e1990 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -260,6 +260,7 @@ src/plugins/Check.py
 src/plugins/CmdRef.py
 src/plugins/CountAncestors.py
 src/plugins/CustomBookText.py
+src/plugins/DateParserDisplayTest.py
 src/plugins/DefaultGramplets.py
 src/plugins/Desbrowser.py
 src/plugins/DescendChart.py
diff --git a/src/GrampsCfg.py b/src/GrampsCfg.py
index fd537296e..398ac7140 100644
--- a/src/GrampsCfg.py
+++ b/src/GrampsCfg.py
@@ -2,6 +2,7 @@
 # Gramps - a GTK+/GNOME based genealogy program
 #
 # Copyright (C) 2000-2007  Donald N. Allingham
+# Copyright (C) 2008  Raphael Ackermann
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -185,19 +186,29 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
         return table
 
     def add_prefix_panel(self):
+        """
+        Add the ID prefix tab to the preferences.
+        """
         table = gtk.Table(3, 8)
         table.set_border_width(12)
         table.set_col_spacings(6)
         table.set_row_spacings(6)
-        self.add_entry(table, _('Person'), 0, Config.IPREFIX)
-        self.add_entry(table, _('Family'), 1, Config.FPREFIX)
-        self.add_entry(table, _('Place'), 2, Config.PPREFIX)
-        self.add_entry(table, _('Source'), 3, Config.SPREFIX)
-        self.add_entry(table, _('Media Object'), 4, Config.OPREFIX)
-        self.add_entry(table, _('Event'), 5, Config.EPREFIX)
-        self.add_entry(table, _('Repository'), 6, Config.RPREFIX)
-#added notes prefix
-        self.add_entry(table, _('Note'), 7, Config.NPREFIX)
+        self.add_entry(table, _('Person'), 0, Config.IPREFIX, 
+                       self.update_idformat_entry)
+        self.add_entry(table, _('Family'), 1, Config.FPREFIX,
+                       self.update_idformat_entry)
+        self.add_entry(table, _('Place'), 2, Config.PPREFIX,
+                       self.update_idformat_entry)
+        self.add_entry(table, _('Source'), 3, Config.SPREFIX,
+                       self.update_idformat_entry)
+        self.add_entry(table, _('Media Object'), 4, Config.OPREFIX,
+                       self.update_idformat_entry)
+        self.add_entry(table, _('Event'), 5, Config.EPREFIX,
+                       self.update_idformat_entry)
+        self.add_entry(table, _('Repository'), 6, Config.RPREFIX,
+                       self.update_idformat_entry)
+        self.add_entry(table, _('Note'), 7, Config.NPREFIX,
+                       self.update_idformat_entry)
         return table
 
     def add_advanced_panel(self):
@@ -791,11 +802,13 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
                      xoptions=gtk.FILL)
         table.attach(hbox, 2, 3, index, index+1, yoptions=0)
 
-    def add_entry(self, table, label, index, constant):
+    def add_entry(self, table, label, index, constant, callback=None):
+        if not callback:
+            callback = self.update_entry
         lwidget = BasicLabel("%s: " % label)
         entry = gtk.Entry()
         entry.set_text(Config.get(constant))
-        entry.connect('changed', self.update_entry, constant)
+        entry.connect('changed', callback, constant)
         table.attach(lwidget, 0, 1, index, index+1, yoptions=0, 
                      xoptions=gtk.FILL)
         table.attach(entry, 1, 2, index, index+1, yoptions=0)
@@ -854,6 +867,18 @@ class GrampsPreferences(ManagedWindow.ManagedWindow):
     def update_entry(self, obj, constant):
         Config.set(constant, unicode(obj.get_text()))
 
+    def update_idformat_entry(self, obj, constant):
+        Config.set(constant, unicode(obj.get_text()))
+        self.dbstate.db.set_prefixes(
+            Config.get(Config.IPREFIX),
+            Config.get(Config.OPREFIX),
+            Config.get(Config.FPREFIX),
+            Config.get(Config.SPREFIX),
+            Config.get(Config.PPREFIX),
+            Config.get(Config.EPREFIX),
+            Config.get(Config.RPREFIX),
+            Config.get(Config.NPREFIX) )
+
     def update_gen_depth(self, obj, constant):
         ok = True
         if not obj.get_text():
diff --git a/src/plugins/DateParserDisplayTest.py b/src/plugins/DateParserDisplayTest.py
index ca2807050..92b727da0 100644
--- a/src/plugins/DateParserDisplayTest.py
+++ b/src/plugins/DateParserDisplayTest.py
@@ -21,9 +21,10 @@
 
 # $Id$
 
-"""Validate localized date parser and displayer.
+"""
+Validate localized date parser and displayer.
 
-    Tools/Debug/Check Localized Date Parser and Displayer...
+Tools/Debug/Check Localized Date Parser and Displayer...
 """
 
 #-------------------------------------------------------------------------