Merge branch '6380-mailuser-otp' into 'develop'

Fix mailuser login, closes #6380

Closes #6380

See merge request !1627
1 job for 6316-hide-stderr-from-which-1-on-centos