Fixing config for logout - ready to merge with master