Emergency Pull

Please merge quickly, redirect after logout's broken.