replace all underscores, not just the first one.
Fix issue where user's would not be redirected on logout.
Merge pull request #654 from nla/bug/acm-dsc-680

Bug/acm dsc 680