Move pre encryption out of post data