Merge "Make UserNotLoggedIn redirect to login page"