Fix typo
Fix/refactor login redirect issues