@Don you’re amazing. I’ve tested it and it addresses my issue perfectly.
It is cheating a little by addressing the problem in a different way (I wasn’t aware of the currentUser variable being accessible from there) but I can’t argue with the results. 
Thanks also @merefield for pointing out the upcoming refactor. I’ll set up a test to monitor our environment for potential regressions.
Thanks guys.