First pass at #380

First form was loaded over HTTP; second over HTTPS.
Merge pull request #808 from vincentbarr/patch-3

First pass at #380