Fixed: MIFOS-5985: Improve user's security