Fixed now, though the full fix is quite extensive (including a couple template changes). The workarounds I posted (one or the other, or both) should work in the mean time. If you get in the redirect loop, the issue should also go away once your session becomes invalid (after an hour of inactivity, usually).