diff --git a/NEWS b/NEWS
index 03a0f0ce2d3583ce3f0ef3350371bcc778bdd707..5dc965b17df85f9371801512be8be079db4ab62b 100644
--- a/NEWS
+++ b/NEWS
@@ -97,6 +97,9 @@ documents those changes that are of interest to users and admins.
  -- Select/cons_res - Permit node removed from job by going down to be returned
     to service and re-used by another job.
  -- Select/cons_res - Tighter packing of job allocations on sockets.
+ -- SlurmDBD - fix to allow user root along with the slurm user to register a
+    cluster.
+ -- Select/cons_res - Fix for support of consecutive node option.
 
 * Changes in Slurm 2.5.4
 ========================
diff --git a/src/plugins/select/cons_res/job_test.c b/src/plugins/select/cons_res/job_test.c
index 2b3646e15446d6c15f4095fdbecb651551997939..c10fb53e642382d649d771c6701a315eace6b8fd 100644
--- a/src/plugins/select/cons_res/job_test.c
+++ b/src/plugins/select/cons_res/job_test.c
@@ -1108,7 +1108,7 @@ static int _eval_nodes(struct job_record *job_ptr, bitstr_t *node_map,
 			if (details_ptr->contiguous &&
 			    details_ptr->req_node_bitmap &&
 			    (consec_req[i] == -1))
-				break;  /* not required nodes */
+				continue;  /* not required nodes */
 
 			sufficient = (consec_cpus[i] >= rem_cpus) &&
 				     _enough_nodes(consec_nodes[i], rem_nodes,
diff --git a/src/slurmdbd/proc_req.c b/src/slurmdbd/proc_req.c
index 886d179bdb7d3890f7b215e2ad2cf4ccf2cc71ce..fd499cea9880e7ab7fbba241bcc2a7de4efb4afa 100644
--- a/src/slurmdbd/proc_req.c
+++ b/src/slurmdbd/proc_req.c
@@ -2687,7 +2687,7 @@ static int   _register_ctld(slurmdbd_conn_t *slurmdbd_conn,
 	slurmdb_cluster_rec_t cluster;
 	dbd_list_msg_t list_msg;
 
-	if (*uid != slurmdbd_conf->slurm_user_id) {
+	if ((*uid != slurmdbd_conf->slurm_user_id) && (*uid != 0)) {
 		comment = "DBD_REGISTER_CTLD message from invalid uid";
 		error("CONN:%u %s %u",
 		      slurmdbd_conn->newsockfd, comment, *uid);