placeholder user@host -> user@provider (fixes #729)

As per #729. Ready for review.