self-service skinning improvements, RT#13199