diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index 91ba2062b618e74b0a2b9dd065d28eff2a88cb9a..70be29021bd6f29907fd9fe27d1fd484e5af7710 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -1746,8 +1746,6 @@ rwfail:
 static int
 _get_user_env(batch_job_launch_msg_t *req)
 {
-	struct passwd pwd, *pwd_ptr = NULL;
-	char pwd_buf[PW_BUF_SIZE];
 	char **new_env;
 	int i;
 	static time_t config_update = 0;
@@ -1767,15 +1765,10 @@ _get_user_env(batch_job_launch_msg_t *req)
 	if (i >= req->envc)
 		return 0;		/* don't need to load env */
 
-	if (slurm_getpwuid_r(req->uid, &pwd, pwd_buf, PW_BUF_SIZE, &pwd_ptr)
-	    || (pwd_ptr == NULL)) {
-		error("%s: getpwuid_r(%u):%m", __func__, req->uid);
-		return -1;
-	}
-	verbose("%s: get env for user %s here", __func__, pwd.pw_name);
+	verbose("%s: get env for user %s here", __func__, req->user_name);
 
 	/* Permit up to 120 second delay before using cache file */
-	new_env = env_array_user_default(pwd.pw_name, 120, 0, no_env_cache);
+	new_env = env_array_user_default(req->user_name, 120, 0, no_env_cache);
 	if (! new_env) {
 		error("%s: Unable to get user's local environment%s",
 		      __func__, no_env_cache ?