Update login-logic to allow redirecting correctly after login
Merge branch 'develop' into module/users