Squashed commit of the following: 2558-two-factor-authentication-followup

commit f2f77b2b
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu May 19 13:36:11 2022 +0200

    Fix indend and add comment

commit 0d12df1f
Merge: 66c00034 5bbec2b9
Author: Herman van Rink <rink@initfour.nl>
Date:   Thu May 19 13:34:45 2022 +0200

    Merge remote-tracking branch 'origin/develop' into 2558-two-factor-authentication-followup

commit 66c00034
Author: Herman van Rink <rink@initfour.nl>
Date:   Sat Apr 2 09:13:18 2022 +0200

    Add otp_email_override support

    UI is still to be implemented