#3580 with a minor ui fix on the remote pub page