Rework password escaping