Merge branch 'ban-logic-fix' into 'master'

Fix some ban logic to be nicer to legit people

See merge request !5
2 jobs for master in 1 minute and 55 seconds (queued for 7 seconds)
latest
Status Name Job ID Coverage
  Test
passed php-syntax-check #1421

00:01:35

 
  Deploy
passed deploy-live #1422

00:00:19