diff --git a/src/slurmctld/acct_policy.c b/src/slurmctld/acct_policy.c
index 5a4aca2ac70d8cf170841a36f7c3467551e82017..55a1d35ad45dfefd6bee2b208285326339068ee5 100644
--- a/src/slurmctld/acct_policy.c
+++ b/src/slurmctld/acct_policy.c
@@ -947,7 +947,6 @@ extern bool acct_policy_job_runnable(struct job_record *job_ptr)
 
 	if (!_valid_job_assoc(job_ptr)) {
 		job_ptr->state_reason = FAIL_ACCOUNT;
-		job_ptr->priority = 1;	/* Move to end of queue */
 		return false;
 	}
 
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index 945b6d3eaa04f600d66f6731d9df7eef22007ab1..20e66277e691b7e4e36f50d9031fb0b1fe42a2ca 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -201,9 +201,8 @@ extern List build_job_queue(bool clear_start)
 			while ((part_ptr = (struct part_record *)
 					list_next(part_iterator))) {
 				job_ptr->part_ptr = part_ptr;
-				if (!acct_policy_job_runnable(job_ptr) ||
-				    (job_limits_check(&job_ptr) !=
-				     WAIT_NO_REASON))
+				if (job_limits_check(&job_ptr) !=
+				    WAIT_NO_REASON)
 					continue;
 				_job_queue_append(job_queue, job_ptr, part_ptr);
 			}
@@ -222,9 +221,6 @@ extern List build_job_queue(bool clear_start)
 				      "part %s", job_ptr->job_id,
 				      job_ptr->partition);
 			}
-			if (!acct_policy_job_runnable_state(job_ptr) ||
-			    !acct_policy_job_runnable(job_ptr))
-				continue;
 			if (!part_policy_job_runnable_state(job_ptr)) {
 				if (job_limits_check(&job_ptr) ==
 				    WAIT_NO_REASON) {