Tech Debt: Refactor to properly get the current user only once