First pass at #389

The form does a validity check on the address.  Also goes from http>https, so manually merged with a find.