Backport of two fixes from master/21.1 to 1.20.
Both commits also apply to the server 1.20 branch. Thanks for consideration.
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.
Both commits also apply to the server 1.20 branch. Thanks for consideration.