Resolve #3589325 "User settings quirks"

Andrei Ivnitskiirequested to merge
issue/privatemsg-3589325:3589325-user-settings-quirks into 2.0.x

Related to #3589325

Merge request reports