Fixes #669 - adds site verification