Feature/fix login redirect 24

Fixes #1208