Don't save payment twice, fix success status