RT#25929: Customer self-service forward editing