Add login redirector and prepare filter fixes