Fixes for post login redirect