Merge branch 'fix-4030' into 'stable-3.1'

Prevent password managers to overwrite passwords (fixes #4030)

Prevent password managers to overwrite passwords in reseller / client and mailbox (fixed #4030)

See merge request !380