diff --git a/source/lib/time.c b/source/lib/time.c
index b4477d693ac..192a418e7a1 100644
--- a/source/lib/time.c
+++ b/source/lib/time.c
@@ -223,6 +223,12 @@ static struct timespec nt_time_to_unix_timespec(NTTIME *nt)
 		return ret;
 	}
 
+	if ((nt->high == 0x7fffffff) && (nt->low == 0xffffffff)) {
+		ret.tv_sec = TIME_T_MAX;
+		ret.tv_nsec = 0;
+		return ret;
+	}
+
 	d = (((uint64)nt->high) << 32 ) + ((uint64)nt->low);
 	/* d is now in 100ns units, since jan 1st 1601".
 	   Save off the ns fraction. */
diff --git a/source/passdb/pdb_interface.c b/source/passdb/pdb_interface.c
index 4baddb3a935..a42f8325f65 100644
--- a/source/passdb/pdb_interface.c
+++ b/source/passdb/pdb_interface.c
@@ -370,7 +370,7 @@ static NTSTATUS pdb_default_create_user(struct pdb_methods *methods,
 #ifdef ENABLE_BUILD_FARM_HACKS
 		if (add_ret != 0) {
 			DEBUG(1, ("Creating a faked user %s for build farm "
-				  "purposes", name));
+				  "purposes\n", name));
 			faked_create_user(name);
 		}
 #endif