Lots of optimisations for account editing
Further tuning to account editing optimisations
Fixing nasty bug in optimisation
Merge branch 'v9' of github.com:chrisgraham/ocPortal into v9