Updated to properly fetch the current user