diff --git a/src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c b/src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c
index aa86c9b..5971087 100644
--- a/src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c
+++ b/src/plugins/acct_gather_profile/hdf5/acct_gather_profile_hdf5.c
@@ -311,11 +311,6 @@ extern int acct_gather_profile_p_node_step_start(stepd_step_rec_t* job)
 
 	g_job = job;
 
-	if (g_job->stepid == NO_VAL) {
-		g_profile_running = ACCT_GATHER_PROFILE_NONE;
-		return rc;
-	}
-
 	xassert(hdf5_conf.dir);
 
 	if (debug_flags & DEBUG_FLAG_PROFILE) {
@@ -397,9 +392,6 @@ extern int acct_gather_profile_p_node_step_end(void)
 
 	xassert(_run_in_daemon());
 
-	if (g_job->stepid == NO_VAL)
-		return rc;
-
 	xassert(g_profile_running != ACCT_GATHER_PROFILE_NOT_SET);
 
 	// No check for --profile as we always want to close the HDF5 file
@@ -435,9 +427,6 @@ extern int acct_gather_profile_p_task_start(uint32_t taskid)
 	xassert(_run_in_daemon());
 	xassert(g_job);
 
-	if (g_job->stepid == NO_VAL)
-		return rc;
-
 	xassert(g_profile_running != ACCT_GATHER_PROFILE_NOT_SET);
 
 	if (g_profile_running <= ACCT_GATHER_PROFILE_NONE)
@@ -459,9 +448,6 @@ extern int acct_gather_profile_p_task_end(pid_t taskpid)
 	xassert(_run_in_daemon());
 	xassert(g_job);
 
-	if (g_job->stepid == NO_VAL)
-		return rc;
-
 	xassert(g_profile_running != ACCT_GATHER_PROFILE_NOT_SET);
 
 	if (!_do_profile(ACCT_GATHER_PROFILE_NOT_SET, g_profile_running))
@@ -520,9 +506,6 @@ extern int acct_gather_profile_p_add_sample_data(uint32_t type, void *data)
 	xassert(_run_in_daemon());
 	xassert(g_job);
 
-	if (g_job->stepid == NO_VAL)
-		return SLURM_SUCCESS;
-
 	xassert(g_profile_running != ACCT_GATHER_PROFILE_NOT_SET);
 
 	if (!_do_profile(type, g_profile_running))
diff --git a/src/slurmd/slurmstepd/slurmstepd_job.c b/src/slurmd/slurmstepd/slurmstepd_job.c
index 4000887..dadea91 100644
--- a/src/slurmd/slurmstepd/slurmstepd_job.c
+++ b/src/slurmd/slurmstepd/slurmstepd_job.c
@@ -517,6 +517,7 @@ batch_stepd_step_rec_create(batch_job_launch_msg_t *msg)
 
 	job->batch   = true;
 	job->node_name  = xstrdup(conf->node_name);
+	job->user_name  = xstrdup(msg->user_name);
 	/* This needs to happen before acct_gather_profile_startpoll
 	   and only really looks at the profile in the job.
 	*/
@@ -530,7 +531,6 @@ batch_stepd_step_rec_create(batch_job_launch_msg_t *msg)
 	job->overcommit = (bool) msg->overcommit;
 
 	job->uid     = (uid_t) msg->uid;
-	job->user_name  = xstrdup(msg->user_name);
 	job->gid     = (gid_t) msg->gid;
 	job->cwd     = xstrdup(msg->work_dir);