2 files changed, 5 insertions, 4 deletions
diff --git a/addressbook/gui/contact-editor/contact-editor.glade b/addressbook/gui/contact-editor/contact-editor.glade
index 7f11886b28..8ee51c6831 100644
--- a/addressbook/gui/contact-editor/contact-editor.glade
+++ b/addressbook/gui/contact-editor/contact-editor.glade
@@ -370,7 +370,7 @@
 
 	<widget>
 	  <class>GtkEntry</class>
-	  <name>entry-phone1</name>
+	  <name>entry-phone1b</name>
 	  <can_focus>True</can_focus>
 	  <editable>True</editable>
 	  <text_visible>True</text_visible>
@@ -961,6 +961,7 @@
 	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>checkbutton-htmlmail</name>
+	    <visible>False</visible>
 	    <label>Wants to receive _HTML mail</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
@@ -1054,7 +1055,6 @@
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <focus_target>entry-phone1</focus_target>
 	  </widget>
 	</widget>
 
@@ -1243,6 +1243,7 @@
 	  <widget>
 	    <class>GtkCheckButton</class>
 	    <name>checkbutton-mailingaddress</name>
+	    <visible>False</visible>
 	    <label>_This is the mailing address</label>
 	    <active>False</active>
 	    <draw_indicator>True</draw_indicator>
@@ -1289,7 +1290,7 @@
 
 	<widget>
 	  <class>GtkAlignment</class>
-	  <name>alignment12</name>
+	  <name>alignment-contacts</name>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xscale>1</xscale>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 235c8ea4b1..165d00e3f1 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -933,7 +933,7 @@ setup_tab_order(GladeXML *gui)
 		list = add_to_tab_order(list, gui, "entry-email1");
 		list = add_to_tab_order(list, gui, "entry-web");
 		list = add_to_tab_order(list, gui, "text-address");
-		list = add_to_tab_order(list, gui, "button-contacts");
+		list = add_to_tab_order(list, gui, "alignment-contacts");
 		list = g_list_reverse(list);
 		e_container_change_tab_order(GTK_CONTAINER(container), list);
 	}