Looks like I put this in before we really started to get 2 pairs of eyes across everything. 

So that combined with my less then stellar regex fu probably doesn't lead to an ideal solution.

@smangelsdorf if you can advise a more robust way of tackling this check so we can get it changed in both pieces of code while this is open that would be great.