Fix bug in current user helper as well as a temporary fix for the login redirect