--- gdm-3.10.0.1/daemon/gdm-simple-slave.c.timed-login-works-more-than-once	2013-09-19 12:29:34.000000000 -0700
+++ gdm-3.10.0.1/daemon/gdm-simple-slave.c	2014-07-04 20:59:18.022444945 -0700
@@ -647,13 +647,14 @@
 start_autologin_conversation_if_necessary (GdmSimpleSlave  *slave)
 {
         gboolean enabled;
+        int delay;
 
-        if (g_file_test (GDM_RAN_ONCE_MARKER_FILE, G_FILE_TEST_EXISTS)) {
+        gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, NULL, &delay);
+
+        if (delay == 0 && g_file_test (GDM_RAN_ONCE_MARKER_FILE, G_FILE_TEST_EXISTS)) {
                 return;
         }
 
-        gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, NULL, NULL);
-
         if (!enabled) {
                 return;
         }
