Fixes for !814
This fixes some problems found with !814. They were split as a separate merge request as suggested at: !814 (comment 1395848)
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
This fixes some problems found with !814. They were split as a separate merge request as suggested at: !814 (comment 1395848)