This paper empirically assesses the link between demographics, pension systems, and current account (CA) balances using the IMF External Balance Assessment (EBA) model. We propose two refinements to the EBA model. We first refine the existing demographic variables to better account for the entire population age structure of countries. Compared to the EBA specification, we find a more robust, smoother, and economically intuitive effect of demographics on CA balances across countries. We then introduce new indicators to account for pension systems. We find a positive and statistically significant relationship between the generosity and coverage of fully funded pension systems and CA balances. Our refinements broadly improve the EBA model fit, especially for advanced economies with a fully funded pension system.