Merge "Revert "Make UserNotLoggedIn redirect to login page""