Incident #19130 - moved code from customer to account