diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index af4293a11e8..e0cbc981def 100644
--- a/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@ -551,7 +551,7 @@ static service sDefault = {
 	False,			/* bStoreDosAttributes */
 	False,			/* bDmapiSupport */
 	True,			/* bLocking */
-	True,			/* iStrictLocking */
+	Auto,			/* iStrictLocking */
 	True,			/* bPosixLocking */
 	True,			/* bShareModes */
 	True,			/* bOpLocks */
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 0a3fc27be63..0524078310f 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -5221,7 +5221,7 @@ int reply_lockingX(connection_struct *conn, char *inbuf, char *outbuf,
 		/* we don't support these - and CANCEL_LOCK makes w2k
 		   and XP reboot so I don't really want to be
 		   compatible! (tridge) */
-		return ERROR_DOS(ERRDOS, ERRnoatomiclocks);
+		return ERROR_FORCE_DOS(ERRDOS, ERRnoatomiclocks);
 	}
 	
 	if (locktype & LOCKING_ANDX_CANCEL_LOCK) {