Cleanup and change login redirect