diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 5c341862e1e..ec139a72e7d 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -349,7 +349,7 @@ struct smb_request {
 	uint16 smbpid;
 	uint64_t mid; /* For compatibility with SMB2. */
 	uint32_t seqnum;
-	uint16 vuid;
+	uint64_t vuid; /* For compatibility with SMB2. */
 	uint16 tid;
 	uint8  wct;
 	const uint16_t *vwv;
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f89631707b7..2ea41b4c41d 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -2080,8 +2080,8 @@ void reply_ulogoffX(struct smb_request *req)
 	vuser = get_valid_user_struct(sconn, req->vuid);
 
 	if(vuser == NULL) {
-		DEBUG(3,("ulogoff, vuser id %d does not map to user.\n",
-			 req->vuid));
+		DEBUG(3,("ulogoff, vuser id %llu does not map to user.\n",
+			 (unsigned long long)req->vuid));
 
 		req->vuid = UID_FIELD_INVALID;
 		reply_force_doserror(req, ERRSRV, ERRbaduid);
@@ -2101,7 +2101,8 @@ void reply_ulogoffX(struct smb_request *req)
 	SSVAL(req->outbuf, smb_vwv0, 0xff); /* andx chain ends */
 	SSVAL(req->outbuf, smb_vwv1, 0);    /* no andx offset */
 
-	DEBUG( 3, ( "ulogoffX vuid=%d\n", req->vuid ) );
+	DEBUG(3, ("ulogoffX vuid=%llu\n",
+		  (unsigned long long)req->vuid));
 
 	END_PROFILE(SMBulogoffX);
 	req->vuid = UID_FIELD_INVALID;