diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 60008491e32f03b37e737fd3422c8b566db44a80..1ebcec6f7281e241fe4afdd03f5a3524690b5ef6 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -71,6 +71,7 @@
 #include "src/common/xstring.h"
 #include "src/common/assoc_mgr.h"
 
+#include "src/slurmctld/acct_policy.h"
 #include "src/slurmctld/agent.h"
 #include "src/slurmctld/job_scheduler.h"
 #include "src/slurmctld/licenses.h"
@@ -4772,6 +4773,7 @@ extern void job_completion_logger(struct job_record  *job_ptr)
 
 	g_slurm_jobcomp_write(job_ptr);
 	jobacct_storage_g_job_complete(acct_db_conn, job_ptr);
+	acct_policy_job_fini(job_ptr);
 }
 
 /*
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 989bc09338f913437eb27020464d396b2d2e7c4a..654809ab331f92783462c3bf74d158913216501b 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -993,6 +993,7 @@ extern int select_nodes(struct job_record *job_ptr, bool test_only,
 		mail_job_info(job_ptr, MAIL_JOB_BEGIN);
 
 	jobacct_storage_g_job_start(acct_db_conn, job_ptr);
+	acct_policy_job_begin(job_ptr);
 
 	slurm_sched_newalloc(job_ptr);