diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog
index fd0b2e2b1..c8f2d79c7 100644
--- a/capplets/about-me/ChangeLog
+++ b/capplets/about-me/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-01  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-about-me.c: (about_me_focus_out): fix email addresses being
+	generated by g-a-m always being saved as type "OTHER" which could
+	result in addresses being mixed up (bug #570113)
+
 2009-02-01  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-about-me.c: (about_me_load_photo), (about_me_update_photo),
diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
index 177efa687..df8250b5e 100644
--- a/capplets/about-me/gnome-about-me.c
+++ b/capplets/about-me/gnome-about-me.c
@@ -335,6 +335,7 @@ about_me_focus_out (GtkWidget *widget, GdkEventFocus *event, GnomeAboutMe *me)
 			me->email[ids[i].cid] = NULL;
 		else
 			me->email[ids[i].cid] = g_strdup (str);
+		me->email_types[ids[i].cid] = (i == EMAIL_HOME) ? ATTRIBUTE_HOME : ATTRIBUTE_WORK;
 	/* FIXME: i'm getting an empty address field in evolution */
 	} else if (i >= ADDRESS_HOME && i < ADDRESS_WORK) {
 		about_me_set_address_field (me->addr1, ids[i].cid, str);