Prevent redirect loop [RD-109]

All tests pass.