diff --git a/CHANGELOG b/CHANGELOG
index d3a8738..e74f399 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 Maui 3.2.6p21
+  - Fixed backfill issue with SINGLEUSER NODEACCESSPOLICY. (Thanks goes to Roy Dragseth)
   - N->{A|C}Res.Swap is overcommitted with N->CRes.Swap instead of N->CRes.Mem. (Thanks goes to Roy Dragseth)
   - Fixed a nodes configured swap from changing in a maui+pbs setup. (Thanks goes to Gareth Williams of CSIRO)
   - Fixed CHECKSUM authentication for maui + slurm. Thanks goes to Eyegene Ryabinkin.
diff --git a/src/moab/MJob.c b/src/moab/MJob.c
index df75dfa..dd11c2f 100644
--- a/src/moab/MJob.c
+++ b/src/moab/MJob.c
@@ -10301,7 +10301,10 @@ int MJobGetSNRange(
 
         if ((J->Req[0]->NAccessPolicy == mnacSingleUser) &&
             (tmpJ != NULL) &&
-            (tmpJ->Cred.U != J->Cred.U))
+            (tmpJ->Cred.U != NULL) &&
+            (J->Cred.U != NULL) &&
+            (tmpJ->Cred.U != J->Cred.U) &&
+            (strcmp(J->Cred.U->Name,"[ALL]")))
           {
           /* user dedicated resources removed */