diff --git a/NEWS b/NEWS
index 1bcbba712301943ff4a5b6af8d52b7ffe753f669..9bba08b2350288f012e41c5001ae171b7032a86b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,8 @@ documents those changes that are of interest to users and admins.
 =============================
  -- Added new srun option --pty to start job with pseudo terminal attached 
     to task 0 (all other tasks have I/O discarded)
+ -- Disable user specifying jobid when sched/wiki2 configured (needed for 
+    Moab releases until early 2007).
 
 * Changes in SLURM 1.3.0-pre1
 =============================
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 865d5f0e9914514778fb6d1dcb1241ab522a6f63..6482acd390cd0aa8221090cf7eb6830228f06206 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -2603,12 +2603,13 @@ static int _validate_job_desc(job_desc_msg_t * job_desc_msg, int allocate,
 	static bool wiki_sched = false;
 	static bool wiki_sched_test = false;
 
-	/* Permit normal user to specify job id only for sched/wiki
-	 * and sched/wiki2 */
+	/* Permit normal user to specify job id only for sched/wiki 
+	 * (Maui scheduler). This was also required with earlier
+	 * versions of the Moab scheduler (wiki2), but was fixed 
+	 * in early 2007 to submit jobs as user root */
 	if (!wiki_sched_test) {
 		char *sched_type = slurm_get_sched_type();
-		if ((strcmp(sched_type, "sched/wiki") == 0)
-		||  (strcmp(sched_type, "sched/wiki2") == 0))
+		if (strcmp(sched_type, "sched/wiki") == 0)
 			wiki_sched = true;
 		xfree(sched_type);
 		wiki_sched_test = true;