Fixed wbdisable links and localStorage handling
Merge pull request #3223 from pjackson28/vapourdisablefix

Fixed wbdisable links and localStorage handling