diff --git a/src/common/env.c b/src/common/env.c
index 7814062d71a93dd0fce154c71d74901aa2cc4c96..9ac0061ac2e22e88176346ed4246947816a5c762 100644
--- a/src/common/env.c
+++ b/src/common/env.c
@@ -1627,7 +1627,7 @@ static char **_load_env_cache(const char *username)
 						break;
 					_strip_cr_nl(line);
 					if ((strlen(value) + strlen(line)) >
-					    (sizeof(value) - 1))
+					    (ENV_BUFSIZE - 2))
 						break;
 					strcat(value, "\n");
 					strcat(value, line);
@@ -1859,7 +1859,7 @@ char **env_array_user_default(const char *username, int timeout, int mode)
 					if (!line)
 						break;
 					if ((strlen(value) + strlen(line)) >
-					    (sizeof(value) - 1))
+					    (ENV_BUFSIZE - 2))
 						break;
 					strcat(value, "\n");
 					strcat(value, line);