Fixes #1358 - add make it quicker to logout