Merge branch 'bugfix' into 'master'

Fix error 500 with expired reset password links

See merge request !234
2 jobs for master in 26 minutes and 36 seconds (queued for 5 seconds)
Status Job ID Name Coverage
  Test
passed #2685
black

00:01:51

passed #2684
test

00:26:36

64.0%