LPS-31961 Repeated CustomQuestion in Password Reminder
LPS-31961 Source formatting
LPS-31593 Fix duplicates
Revert "LPS-31593 Fix duplicates"

This reverts commit 8834d6521770eee5a49b92d7272d00d8fe1b89b8.