Feature/fix login redirect

Fixes of #1208 in develop