Don't add username/password if none are required
Incrementing for publish