diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 9399136c4..9f6bb5438 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-31  Jody Goldberg <jody@gnome.org>
+
+	* gnome-settings-accessibility-keyboard.c
+	(gnome_settings_accessibility_keyboard_init) : register the gconf
+	  handler early.
+	(gnome_settings_accessibility_keyboard_load) : not here where it is
+	  too late.
+
 2002-10-26  Havoc Pennington  <hp@pobox.com>
 
 	* gnome-settings-wm.c, gnome-settings-wm.h: blow this away
diff --git a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
index bfa32d3cb..0c79d902c 100644
--- a/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
+++ b/gnome-settings-daemon/gnome-settings-accessibility-keyboard.c
@@ -410,10 +410,14 @@ gnome_settings_accessibility_keyboard_load (GConfClient *client)
 	gdk_error_trap_pop ();
 
 	gdk_window_add_filter (NULL, &cb_xkb_event_filter, NULL);
-
-	gnome_settings_daemon_register_callback (CONFIG_ROOT, &set_server_from_gconf);
 }
 
+
+void
+gnome_settings_accessibility_keyboard_init (GConfClient *client)
+{
+	gnome_settings_daemon_register_callback (CONFIG_ROOT, &set_server_from_gconf);
+}
 #else
 
 void
@@ -421,10 +425,8 @@ gnome_settings_accessibility_keyboard_load (GConfClient *client)
 {
 	g_warning ("Unsupported in this build");
 }
-#endif
-
 void
 gnome_settings_accessibility_keyboard_init (GConfClient *client)
 {
-
 }
+#endif