--- gdm-2.18.1/gui/gdmlogin.c	2007-04-09 06:15:10.000000000 +0100
+++ gdm-2.18.1-new/gui/gdmlogin.c	2007-04-27 15:36:49.044203677 +0100
@@ -2299,13 +2299,6 @@
 {
 	const char *login_string;
 
-	if ((event->keyval == GDK_Tab ||
-	     event->keyval == GDK_KP_Tab) &&
-	    (event->state & (GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SHIFT_MASK)) == 0) {
-		gdm_login_enter (entry);
-		return TRUE;
-	}
-
 	/*
 	 * Set ok button to sensitive only if there are characters in
 	 * the entry field
@@ -2785,18 +2778,15 @@
 
     /* FIXME: No Documentation yet.... */
     /*help_button = gtk_button_new_from_stock (GTK_STOCK_OK);
-    GTK_WIDGET_UNSET_FLAGS (help_button, GTK_CAN_FOCUS);
     gtk_widget_show (help_button);*/
 
     ok_button = gtk_button_new_from_stock (GTK_STOCK_OK);
-    GTK_WIDGET_UNSET_FLAGS (ok_button, GTK_CAN_FOCUS);
     g_signal_connect (G_OBJECT (ok_button), "clicked",
 		      G_CALLBACK (gdm_login_ok_button_press),
 		      entry);
     gtk_widget_show (ok_button);
 
     start_again_button = gtk_button_new_with_mnemonic (_("_Start Again"));
-    GTK_WIDGET_UNSET_FLAGS (start_again_button, GTK_CAN_FOCUS);
     g_signal_connect (G_OBJECT (start_again_button), "clicked",
 		      G_CALLBACK (gdm_login_start_again_button_press),
 		      entry);
