diff --git a/src/daemon.c b/src/daemon.c
index aa9d050..d51be4d 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -304,7 +304,8 @@ entry_generator_fgetpwent (Daemon       *daemon,
                 pwent = fgetpwent (generator_state->fp);
                 if (pwent != NULL) {
                         shadow_entry_buffers = g_hash_table_lookup (generator_state->shadow_users, pwent->pw_name);
-
+                        *spent = NULL;
+                        
                         if (shadow_entry_buffers != NULL) {
                                 *spent = &shadow_entry_buffers->spbuf;
                         }
diff --git a/tests/test-libaccountsservice.py b/tests/test-libaccountsservice.py
index 723ab51..69b9083 100644
--- a/tests/test-libaccountsservice.py
+++ b/tests/test-libaccountsservice.py
@@ -115,8 +115,8 @@ class TestAccountsServicePreExistingUser(AccountsServiceTestBase):
             self.assertTrue(user_objects[instance].is_loaded())
 
         for user in user_objects:
-            self.assertEquals(user.get_user_name(), 'pizza')
-            self.assertEquals(user.get_uid(), 2001)
+            self.assertEqual(user.get_user_name(), 'pizza')
+            self.assertEqual(user.get_uid(), 2001)
 
 @unittest.skipUnless(have_accounts_service,
                      'AccountsService gi introspection not available')