Add secured passwords
Get rid of I18n deprecation