First pass at having different password recovery levels, a=chris

diff --git a/src/configs/Config.php b/src/configs/Config.php
index cb4759556..830ea8bf8 100755
--- a/src/configs/Config.php
+++ b/src/configs/Config.php
@@ -270,6 +270,12 @@ nsdefine('IMAGE_CAPTCHA', 3);
 nsdefine('NORMAL_AUTHENTICATION', 1);
 /** Authentication Mode Possibility*/
 nsdefine('ZKP_AUTHENTICATION', 2);
+/** */
+nsdefine('NO_RECOVERY', 0);
+/** */
+nsdefine('EMAIL_RECOVERY', 1);
+/** */
+nsdefine('EMAIL_AND_QUESTIONS_RECOVERY', 2);
 /** If ZKP Authentication via Fiat Shamir Protocol used how many iterations
  * to do
  */
@@ -321,6 +327,7 @@ if (file_exists(WORK_DIRECTORY . PROFILE_FILE_NAME)) {
     nsdefine('PROFILE', false);
     nsdefine('DBMS', 'Sqlite3');
     nsdefine('AUTHENTICATION_MODE', NORMAL_AUTHENTICATION);
+    nsdefine('RECOVERY_MODE', EMAIL_RECOVERY);
     nsdefine('DEBUG_LEVEL', NO_DEBUG_INFO);
     nsdefine('USE_FILECACHE', false);
     nsdefine('WEB_ACCESS', true);
diff --git a/src/configs/PublicHelpPages.php b/src/configs/PublicHelpPages.php
index 55364af42..a83207730 100644
--- a/src/configs/PublicHelpPages.php
+++ b/src/configs/PublicHelpPages.php
@@ -53,7 +53,7 @@ END_HEAD_VARS
 ==Your request would result in an edit conflict, so will not be processed.==
 EOD;
 $public_pages["en-US"]["Main"] = <<< 'EOD'
-page_type=standard
+page_type=media_list

 page_alias=

@@ -69,13 +69,13 @@ robots=

 description=

+alternative_path=
+
 page_header=

 page_footer=

 END_HEAD_VARS
-
-
 EOD;
 $public_pages["en-US"]["Syntax"] = <<< 'EOD'
 page_type=standard
@@ -549,20 +549,23 @@ robots=

 description=

+alternative_path=
+
 page_header=

 page_footer=

-END_HEAD_VARS=Title=
-* Slide Item
-* Slide Item
-* Slide Item
-....
-=Title=
-* Slide Item
-* Slide Item
-* Slide Item
-....
+END_HEAD_VARS=Title=
+* Slide Item
+* Slide Item
+* Slide Item
+....
+=Title=
+* Slide Item
+* Slide Item
+* Slide Item
+....
+

 EOD;
 $public_pages["en-US"]["privacy"] = <<< 'EOD'
@@ -845,27 +848,27 @@ robots=

 description=

+alternative_path=
+
 page_header=

 page_footer=

-END_HEAD_VARSThe Captcha Type field set controls what kind of
-[[https://en.wikipedia.org/wiki/CAPTCHA|captcha]] will be used during account
-registration, password recovery, and if a user wants to suggest a url.
-
-* The choices for captcha are:
-** &#039;&#039;&#039;Text Captcha&#039;&#039;&#039;, the user has to select from a series of dropdown answers
-to questions of the form: &#039;&#039;Which in the following list is the most/largest/etc?
-or Which is the following list is the least/smallest/etc?; &#039;&#039;
-** &#039;&#039;&#039;Graphic Captcha&#039;&#039;&#039;, the user needs to enter a sequence of characters from
-a distorted image;
-** &#039;&#039;&#039;Hash captcha&#039;&#039;&#039;, the user&#039;s browser (the user doesn&#039;t need to do anything)
-needs to extend a random string with additional characters to get a string
-whose hash begins with a certain lead set of characters.
-
-Of these, Hash Captcha is probably the least intrusive but requires
-Javascript and might run slowly on older browsers. A text captcha might be used
-to test domain expertise of the people who are registering for an account.
+END_HEAD_VARSThe Captcha Type field set controls what kind of
+[[https://en.wikipedia.org/wiki/CAPTCHA|captcha]] will be used during account
+registration, password recovery, and if a user wants to suggest a url. The choices for captcha are:
+* &#039;&#039;&#039;Text Captcha&#039;&#039;&#039;, the user has to select from a series of dropdown answers
+to questions of the form: &#039;&#039;Which in the following list is the most/largest/etc?
+or Which is the following list is the least/smallest/etc?; &#039;&#039;
+* &#039;&#039;&#039;Graphic Captcha&#039;&#039;&#039;, the user needs to enter a sequence of characters from
+a distorted image;
+* &#039;&#039;&#039;Hash captcha&#039;&#039;&#039;, the user&#039;s browser (the user doesn&#039;t need to do anything)
+needs to extend a random string with additional characters to get a string
+whose hash begins with a certain lead set of characters.
+
+Of these, Hash Captcha is probably the least intrusive but requires
+Javascript and might run slowly on older browsers. A text captcha might be used
+to test domain expertise of the people who are registering for an account.
 Finally, the graphic captcha is probably the one people are most familiar with.
 EOD;
 $help_pages["en-US"]["Changing_the_Classifier_Label"] = <<< EOD
@@ -1754,6 +1757,35 @@ page_footer=
 END_HEAD_VARS* Yioop can make use of a proxy server to do web
 crawling.
 EOD;
+$help_pages["en-US"]["Recovery_Type"] = <<< EOD
+page_type=standard
+
+page_alias=
+
+page_border=solid-border
+
+toc=true
+
+title=
+
+author=
+
+robots=
+
+description=
+
+alternative_path=
+
+page_header=
+
+page_footer=
+
+END_HEAD_VARSThe Recovery Type field set controls whether and how user account recovery can be handled in an automated fashion. The available choices are:
+* &#039;&#039;&#039;No User Password Recovery Link&#039;&#039;&#039;, no &quot;Forgot Password?&quot; link is provided and a user cannot recover
+their password on their own;
+* &#039;&#039;&#039;Email Link Password Recovery&#039;&#039;&#039;, a user can specify their login and get emailed a password change link;
+* &#039;&#039;&#039;Email Link and Check Questions Recovery&#039;&#039;&#039;, a user can specify their login and get emailed a password change link. The password change page requires the user correctly answers previously provided recovery questions.
+EOD;
 $help_pages["en-US"]["Search_Results_Editor"] = <<< EOD
 page_type=standard

diff --git a/src/controllers/RegisterController.php b/src/controllers/RegisterController.php
index bb0e189a4..88f337b08 100755
--- a/src/controllers/RegisterController.php
+++ b/src/controllers/RegisterController.php
@@ -165,6 +165,10 @@ class RegisterController extends Controller implements CrawlConstants
                 }
             }
         }
+        if (C\RECOVERY_MODE == C\NO_RECOVERY) {
+            $this->activities = ["createAccount", "emailVerification",
+                "processAccountData", "suggestUrl"];
+        }
         parent::__construct();
     }
     /**
@@ -194,18 +198,24 @@ class RegisterController extends Controller implements CrawlConstants
             $activity = 'createAccount';
         }
         $data["check_user"] = true;
+        $data["check_fields"] = $this->register_fields;
         if (C\CAPTCHA_MODE == C\TEXT_CAPTCHA) {
-            $data["check_fields"] = $this->register_fields;
-            for ($i = 0; $i < self::NUM_CAPTCHA_QUESTIONS +
-                self::NUM_RECOVERY_QUESTIONS; $i++) {
-                $data["check_fields"][] = "question_$i";
+            if(C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                $num_questions = self::NUM_CAPTCHA_QUESTIONS +
+                    self::NUM_RECOVERY_QUESTIONS;
+            } else {
+                $num_questions = self::NUM_CAPTCHA_QUESTIONS;
             }
         } else {
-            $data["check_fields"] = $this->register_fields;
-            for ($i = 0; $i < self::NUM_RECOVERY_QUESTIONS; $i++) {
-                $data["check_fields"][] = "question_$i";
+            if(C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                $num_questions = self::NUM_RECOVERY_QUESTIONS;
+            } else {
+                $num_questions = 0;
             }
         }
+        for ($i = 0; $i < $num_questions; $i++) {
+            $data["check_fields"][] = "question_$i";
+        }
         $this->preactivityPrerequisiteCheck($activity,
             'processAccountData', 'createAccount', $data);
         unset($data["check_user"]);
@@ -346,11 +356,19 @@ class RegisterController extends Controller implements CrawlConstants
                 $server->send($subject, C\MAIL_SENDER, $data['EMAIL'],
                     $message);
                 if (C\CAPTCHA_MODE == C\TEXT_CAPTCHA) {
-                    $num_questions = self::NUM_CAPTCHA_QUESTIONS +
-                        self::NUM_RECOVERY_QUESTIONS;
+                    if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                        $num_questions = self::NUM_CAPTCHA_QUESTIONS +
+                            self::NUM_RECOVERY_QUESTIONS;
+                    } else {
+                        $num_questions = self::NUM_CAPTCHA_QUESTIONS;
+                    }
                     $start = self::NUM_CAPTCHA_QUESTIONS;
                 } else {
-                    $num_questions =  self::NUM_RECOVERY_QUESTIONS;
+                    if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                        $num_questions = self::NUM_RECOVERY_QUESTIONS;
+                    } else {
+                        $num_questions = 0;
+                    }
                     $start = 0;
                 }
                 for ($i = $start; $i < $num_questions; $i++) {
@@ -489,7 +507,9 @@ class RegisterController extends Controller implements CrawlConstants
         }
         $session = $user_model->getUserSession($user["USER_ID"]);
         if (!isset($session['RECOVERY']) ||
-            !isset($session['RECOVERY_ANSWERS'])) {
+            (C\RECOVERY_MODE == C\NO_RECOVERY) ||
+            (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY &&
+            !isset($session['RECOVERY_ANSWERS']))) {
             $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
             tl('register_controller_account_recover_fail')."</h1>');";
             return $data;
@@ -557,7 +577,8 @@ class RegisterController extends Controller implements CrawlConstants
                 $user['CREATION_TIME'] . C\AUTH_KEY,
                 urldecode($data['finish_hash'])));
             if ($finish_hash != $data['finish_hash'] ||
-                !$this->checkRecoveryQuestions($user)) {
+                (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY &&
+                !$this->checkRecoveryQuestions($user))) {
                 $visitor_model->updateVisitor(
                     $_SERVER['REMOTE_ADDR'], "captcha_time_out");
                 $data['SCRIPT'] = "doMessage('<h1 class=\"red\" >".
@@ -609,7 +630,9 @@ class RegisterController extends Controller implements CrawlConstants
             }
         }
         if (!isset($user_session['RECOVERY']) ||
-            !isset($user_session['RECOVERY_ANSWERS'])) {
+            (C\RECOVERY_MODE == C\NO_RECOVERY) ||
+            (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY &&
+            !isset($user_session['RECOVERY_ANSWERS']))) {
             $data['SCRIPT'] = $recover_fail;
             return $data;
         }
@@ -1205,11 +1228,19 @@ class RegisterController extends Controller implements CrawlConstants
             $data["REPASSWORD"] = "";
         }
         if (C\CAPTCHA_MODE == C\TEXT_CAPTCHA) {
-            $num_questions = self::NUM_CAPTCHA_QUESTIONS +
-                self::NUM_RECOVERY_QUESTIONS;
+            if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                $num_questions = self::NUM_CAPTCHA_QUESTIONS +
+                    self::NUM_RECOVERY_QUESTIONS;
+            } else {
+                $num_questions = self::NUM_CAPTCHA_QUESTIONS;
+            }
             $num_captchas = self::NUM_CAPTCHA_QUESTIONS;
         } else {
-            $num_questions = self::NUM_RECOVERY_QUESTIONS;
+            if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                $num_questions = self::NUM_RECOVERY_QUESTIONS;
+            } else {
+                $num_questions = 0;
+            }
             $num_captchas = 0;
         }
         for ($i = 0; $i < $num_questions; $i++) {
diff --git a/src/controllers/components/SystemComponent.php b/src/controllers/components/SystemComponent.php
index 171b12214..35d6bc49f 100755
--- a/src/controllers/components/SystemComponent.php
+++ b/src/controllers/components/SystemComponent.php
@@ -700,26 +700,34 @@ EOD;
         $data['SCRIPT'] = "";
         $data["ELEMENT"] = "security";
         $data["CURRENT_LOCALE"] = L\getLocaleTag();
-        $data['CAPTCHA_MODES'] = array (
+        $data['CAPTCHA_MODES'] = [
            C\TEXT_CAPTCHA =>
                tl('captchasettings_element_text_captcha'),
            C\HASH_CAPTCHA =>
                tl('captchasettings_element_hash_captcha'),
            C\IMAGE_CAPTCHA =>
                tl('captchasettings_element_image_captcha'),
-            );
+            ];
+        $data['RECOVERY_MODES'] = [
+           C\NO_RECOVERY =>
+               tl('captchasettings_element_no_recovery'),
+           C\EMAIL_RECOVERY =>
+               tl('captchasettings_element_email_recovery'),
+           C\EMAIL_AND_QUESTIONS_RECOVERY =>
+               tl('captchasettings_element_email_questions'),
+            ];
         if (C\FIAT_SHAMIR_MODULUS != "") {
-            $data['AUTHENTICATION_MODES'] = array (
+            $data['AUTHENTICATION_MODES'] = [
                     C\NORMAL_AUTHENTICATION =>
                        tl('serversettings_element_normal_authentication'),
                     C\ZKP_AUTHENTICATION =>
                        tl('serversettings_element_zkp_authentication'),
-                );
+                ];
         } else {
-            $data['AUTHENTICATION_MODES'] = array (
+            $data['AUTHENTICATION_MODES'] = [
                     C\NORMAL_AUTHENTICATION =>
                        tl('serversettings_element_normal_authentication'),
-                );
+                ];
             $data['ZKP_UNAVAILABLE'] = true;
         }
         if (isset($_REQUEST['arg']) &&
@@ -738,7 +746,12 @@ EOD;
                             $_REQUEST['AUTHENTICATION_MODE'];
                         $change = true;
                     }
-                    if ($change) {
+                    if (in_array($_REQUEST['RECOVERY_MODE'],
+                        array_keys($data['RECOVERY_MODES']))) {
+                        $profile["RECOVERY_MODE"] =
+                            $_REQUEST['RECOVERY_MODE'];
+                        $change = true;
+                    }                    if ($change) {
                         $profile_model->updateProfile(C\WORK_DIRECTORY,
                             [], $profile);
                         return $parent->redirectWithMessage(
@@ -753,6 +766,7 @@ EOD;
         $data = array_merge($data,
             $profile_model->getProfile(C\WORK_DIRECTORY));
         $data["CAPTCHA_MODE"] = $profile["CAPTCHA_MODE"];
+        $data["RECOVERY_MODE"] = $profile["RECOVERY_MODE"];
         return $data;
     }
     /**
diff --git a/src/data/default.db b/src/data/default.db
index 65716991b..161146fd7 100644
Binary files a/src/data/default.db and b/src/data/default.db differ
diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini
index b887838b8..79e152043 100755
--- a/src/locale/ar/configure.ini
+++ b/src/locale/ar/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "حدد تتبع الارتباطات"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = "تتبع الارتباطات الافتراضية"
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "حدد تتبع الارتباطات"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = "تتبع الارتباطات الافتراضية"
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = "الزحف ميكس إنشاؤها!"
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = "الزحف ميكس حذف!"
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = "ميكسحذف لاتوجد لا!"
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "إضافة عمليات تتبع الارتباطات"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "عدد من النتائج"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "الوزن"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "إجراءات"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "إضافة استعلام"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = "الزحف ميكس التغييرات المحفوظة!"
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "تحديث الشخصية!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "كان هناك ملفتعريف تحديث المشكلة!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "كان هناك ملفتعريف تحديث المشكلة!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = "يجب استخدام مسار مطلق لدليل العمل"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "تعيين دليل العمل! قد تحتاج إلى إعادة تسجيل الدخول! "
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "الرجاء تسمية الروبوت الخاص بك"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "يعمل الدليل والشخصية التي تم إنشاؤها!"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "تعذر التحديث config.php الملف!"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "غير قادر على إنشاء الشخصية!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "دليل العمل هو صالح! لا يمكن إنشاء الشخصية! "
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "دليل العمل هو صالح! لا يمكن إنشاء الشخصية! "
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "تحديث الشخصية!"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "كان هناك ملفتعريف تحديث المشكلة!"
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "يرجى وصف الروبوت الخاص بك"
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = "بي إتش بي 4لإصدار 5.3 أو أحدث"
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = "configs/config.php ليس ملقم ويب للكتابة."
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = "دليل العمل يجب أن يكون قابل للكتابة من قبل ملقم ويب."
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = "pnp.ini ملف post_max_size متغيرينبغي أن يكون مالا يقل عن 32 م"
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = "مطلوب ما يلي العناصر في عداد المفقودين:  %s"
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = "كانت العناصر الاختيارية التالية مفقودة:  %s"
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = "تمرير الاختيار."
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = "استخدام configs/local_config.php حتى تغيير دليل العمل أعلاه قد لا تعمل."
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "كلمة المرور"
 ; SigninView.php line: 109
 signin_view_login = "تسجيل الدخول"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini
index 9c320d66b..f0822d5c0 100755
--- a/src/locale/bn/configure.ini
+++ b/src/locale/bn/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = ""
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini
index 541f2319a..ad4d36b5a 100755
--- a/src/locale/de/configure.ini
+++ b/src/locale/de/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = ""
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini
index 94cfa757f..7bca4a0f3 100644
--- a/src/locale/en_US/configure.ini
+++ b/src/locale/en_US/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = "Not a member or can&#039;t read that group.
 ; SocialComponent.php line: 1506
 social_component_no_group_access = "Not a member or can&#039;t read that group. Switching to public group!"
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = "Standard"
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = "Page Alias"
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = "Media List"
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = "Presentation"
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = "Solid"
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = "Dashed"
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = "None"
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = "Missing Fields!"
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = "Wiki Page Has Been Edited Since Your Version. Loading Changed Version!"
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = "%s Wiki Page Created!"
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = "Discuss the page in this thread!"
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = "Page Saved!"
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = "Resource Deleted!"
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = "Resource Not Deleted! "
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = "Resource Renamed!"
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = "Resource not Renamed!"
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = "Need to Save Page Before Using Resources!"
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = "%s Wiki Page Created!"
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = "Discuss the page in this thread!"
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = "Resource Uploaded!"
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = "Upload Error!"
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = "Back"
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = "Historical Version of %s from %s."
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = "Back"
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = "%s line differences between %s and %s."
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = "Wiki Page Has Been Edited Since Your Version. Loading Changed Version!"
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = "Revert to %s."
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = "Page Reverted!"
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = "Error Reverting Page!"
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = "Main"
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = "Small"
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = "Medium"
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = "Large"
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = "Size"
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = "Header row:"
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = "Example"
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = "Table Title"
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = "Submit"
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = "Cancel"
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = "Bold text"
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = "Italic text"
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = "Underlined text"
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = "Striked text"
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = "Heading"
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = "Level 1 Heading"
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = "Level 2 Heading"
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = "Level 3 Heading"
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = "Level 4 Heading"
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = "Unordered list item"
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = "Ordered list item"
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = "Insert non-formatted text here"
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = "Add Search Bar Form"
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = "Size"
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = "Add Wiki Table"
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = "Column Count:"
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = "Row Count:"
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = "Add Hyperlink"
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = "Text:"
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = "URL:"
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = "Search Placeholder Text"
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = "This text is centered."
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = "This text is right-aligned."
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = "This text is left-aligned."
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = "Item"
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = "Definition"
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = "Title"
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = "Slide Item"
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = "Resource Description for "
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "Select Crawl"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = "Default Crawl"
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "Select Crawl"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = "Default Crawl"
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = "Crawl Mix Created!"
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = "Mix Name in Use or Invalid!"
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = "Invalid Timestamp!"
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = "Crawl Mix Deleted!"
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = "Mix to Delete Does not Exist!"
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = "Mix Successfully Imported!"
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = "Setting Crawl To Use as Index"
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = "Error in comment data!"
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = "Shared Mix Has An Invalid Timestamp"
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = "Cannot post to that group!"
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = "Try out this crawl mix!"
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = "%s is sharing the crawl mix %s!"
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = "Thread Created!"
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = "Invalid Timestamp!"
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = "Not Mix Owner!"
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "Add Crawls"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "Results Shown"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = "Remove"
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "Weight"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = "Name"
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = "Keywords"
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "Actions"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "Add Query"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = "Delete"
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = "Too Many Search Result Fragments!"
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = "Crawl Mix Changes Saved!"
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = "Hash Captcha"
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = "Image Captcha"
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = "No User Password Recovery Link"
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = "Email Link Password Recovery"
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = "Email Link and Check Questions Recovery"
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = "Normal Authentication"
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = "ZKP Authentication"
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = "Normal Authentication"
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = "Settings Updated!"
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = "No Settings Were Changed!"
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = "No Resource Folder!"
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = "Invalid File Type!"
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = "File Too Big!"
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "Profile Updated!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = "Reset Completed"
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = "Must use an Absolute path for Work Directory"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = "Work Directory cannot be contained in Yioop folder!"
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "Work Directory Set! You may need to re-login!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "Please Name Your robot"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "Working Directory and Profile Created!"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "Unable to Update config.php File!"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "Unable to Create Profile!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "Profile Updated!"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "Please Describe Your Robot"
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = "PHP Version 5.4 or Newer"
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = "configs/config.php not web server writable."
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = "Work directory needs to be writable by web server. "
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = "php.ini file variable post_max_size should be at least 2M"
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = "The following required items were missing:"
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = "The following optional items were missing:"
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = "Check Passed."
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = "Using configs/LocalConfig.php so changing work directory above may not work."
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = "Unable to recover account!"
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = "Recover email already used!"
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = "Recover email has expired!"
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = "Password changed!"
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = "Passwords don&#039;t match!"
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = "Recover email already used!"
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = "Recover email has expired!"
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = "Format of URL is invalid!"
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = "Starred fields need to be filled in correctly!"
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = "Hash Code Did Not Match!"
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = "Got human check questions wrong!"
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = "Captcha Mis-entered!"
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = "Suggest URL buffer is full! Please try again later!"
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = "Suggested URL saved!"
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = "Cookies need to be enabled to register or log in to a Yioop!"
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = "Got human check questions wrong!"
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = "Captcha Mis-entered!"
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = "Hash Code Did Not Match!"
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = "Starred fields need to be filled in correctly!"
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = "Check Email Address!"
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = "Account not created - Username already in use!!"
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = "Captcha Type"
 ; SecurityElement.php line: 103
 security_element_save = "Save"
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = "Recovery Type"
+;
+; SecurityElement.php line: 123
+security_element_save = "Save"
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = "Captcha and Recovery Questions"
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = "Edit Account Recovery Questions"
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = "Edit Text Captcha Questions"
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = "Edit Account Recovery Questions"
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = "Edit Text Captcha Questions"
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = "Resources are images, videos, or files associated
 ; WikiElement.php line: 525
 wiki_element_rename_failed = "Rename Failed!"
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = "Rename"
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = "Add to Page"
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = "No resources have been saved to this page yet."
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = "%s Group Wiki Page List"
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = "Search group page titles"
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = "Go"
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = "Create Page: %s"
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = "Redirects to:"
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = "This group has no pages yet for the %s locale. Search for a nonexistant page and click edit to create it."
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = "Back"
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = "Difference:"
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = "Go"
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = "First"
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = "Second"
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = "First"
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = "Second"
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = "Edited by %s. "
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = "(%s bytes)."
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = "Revert"
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = "Revert"
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = "Re-type password:"
 ; RecoverView.php line: 131
 recover_view_username = "Username:"
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = "Recovery Info:"
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = "Human Check:"
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = "Human Check:"
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = "Recover Account"
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = "Return to Yioop"
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "Password"
 ; SigninView.php line: 109
 signin_view_login = "Login"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = "Forgot Password?"
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = "Create Account"
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = "Return"
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini
index 50d382f8e..2ce553107 100755
--- a/src/locale/es/configure.ini
+++ b/src/locale/es/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "Seleccionar Rastreo"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "Seleccionar Rastreo"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = "Rastreo Mix creado!"
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = "Rastreo Mix eliminado!"
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = "Mix para eliminar (borrar) no existe!"
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "A&ntilde;adir Rastreos"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "N&uacute;mero de Resultados"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "Tama&ntilde;o"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "Acciones"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "Agregar consulta"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = "Guardados los Cambios del Rastreo Mix!"
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "Perfil actualizado!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "Hubo un problema al actualizar el perfil!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "Hubo un problema al actualizar el perfil!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = "Debe utilizar una ruta absoluta para el directorio de trabajo"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "El trabajo conjunto de Directorio! Puede que tenga que volver a entrar!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "Por favor, Nombre tu Robot"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "Directorio de Trabajo y Perfil creados!"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "No se puede actualizar el archivo config.php!"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "No se puede crear el perfil!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "Directorio de trabajo es inv&aacute;lido! No se puede crear el perfil!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "Directorio de trabajo es inv&aacute;lido! No se puede crear el perfil!"
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "Perfil actualizado!"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "Hubo un problema al actualizar el perfil!"
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "Por favor describa su robot"
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = "PHP Version 5.4 o la M&aacute;s Reciente"
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = "configs/config.php el servidor web no es escribible."
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = "Directorio de trabajo tiene que ser escribible por el servidor web"
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = "La variable post_max_size del archivo php.ini deber�a ser de al menos 32M"
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = "Los siguientes elementos necesarios (requeridos), no estaban: %s"
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = "Los siguientes elementos opcionales, no estaban: %s"
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = "Entrada Aprobada"
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = ""
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini
index 2afdefdb9..95255202b 100755
--- a/src/locale/fa/configure.ini
+++ b/src/locale/fa/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "یک خزش انتخاب کنید"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = "خزش پیش&zwnj;فرض"
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "یک خزش انتخاب کنید"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = "خزش پیش&zwnj;فرض"
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = "ترکیب خزش ساخته شد!"
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = "ترکیب خزش حذف شد!"
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = "ترکیبی که می&zwnj;خواهید حذف کنید وجود ندارد!"
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "خزش اضافه کن"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "تعداد نتایج"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "وزن"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "فرمان&zwnj;ها"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "پُرسمان اضافه کن"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = "تغییرات ترکیب خزش ذخیره شد!"
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "پروفایل به روز شد!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "در به روز رسانی پروفایل مشکلی پیش آمده است!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "در به روز رسانی پروفایل مشکلی پیش آمده است!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = "باید از مسیر مطلق برای پوشهٔ کار استفاده کرد"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = "پوشهٔ کار نمی&zwnj;تواند در پوشهٔ Yioop باشد."
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "پوشهٔ کار تنظیم شد! احتمالن لازم است دوباره وارد شوید.!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "لطفن برای رباتتان نامی بگذارید"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "پوشهٔ کار و پروفایل ساخته شدند!"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "نمی&zwnj;توان فایل config.php را به روز کرد!"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "نمی&zwnj;توان پروفایل را ساخت!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "پوشهٔ کار معتبر نیست! نمی&zwnj;توان پروفایل را ساخت!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "پوشهٔ کار معتبر نیست! نمی&zwnj;توان پروفایل را ساخت!"
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "پروفایل به روز شد!"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "در به روز رسانی پروفایل مشکلی پیش آمده است!"
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "لطفن رباتتان را توصیف کنید"
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = "PHP نسخهٔ ۳.۵ یا جدیدتر"
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = "وب سرور نمی&zwnj;تواند در configs/config.php بنویسد."
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = "وب سرور باید بتواند در پوشهٔ کار بنویسد."
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = "متغیر post_max_size در php.ini باید حداقل ۲ مگابایت باشد. "
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = "موارد لازم زیر خالی هستند: %s"
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = "موارد اختیاری زیر خالی هستند: %s"
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = "در بررسی مشکلی پیدا نشد."
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = "از configs/local_config.php استفاده می&zwnj;شود، بنابراین ممکن است تغییر بالا عمل نکند."
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "رمز عبور"
 ; SigninView.php line: 109
 signin_view_login = "ورود"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/fa/statistics.txt b/src/locale/fa/statistics.txt
index 187cb44f0..b26155324 100755
--- a/src/locale/fa/statistics.txt
+++ b/src/locale/fa/statistics.txt
@@ -1 +1 @@
-d:32;
\ No newline at end of file
+d:31;
\ No newline at end of file
diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini
index 618405d8d..1c2a595a8 100755
--- a/src/locale/fr_FR/configure.ini
+++ b/src/locale/fr_FR/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "Mot de passe"
 ; SigninView.php line: 109
 signin_view_login = "Se connecter"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini
index 59114b43d..aa0f15e3e 100755
--- a/src/locale/he/configure.ini
+++ b/src/locale/he/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "פרופייל עודכן"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "בעיה עם עדכון הפרופייל"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "בעיה עם עדכון הפרופייל"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "פרופייל עודכן"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "בעיה עם עדכון הפרופייל"
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "סיסמא"
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini
index e35f7615f..f900a12f3 100755
--- a/src/locale/hi/configure.ini
+++ b/src/locale/hi/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "पासवर्ड"
 ; SigninView.php line: 109
 signin_view_login = "लॉग इन करें"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/in_ID/configure.ini b/src/locale/in_ID/configure.ini
index d2f76662f..6d2f238f2 100755
--- a/src/locale/in_ID/configure.ini
+++ b/src/locale/in_ID/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "Kata sandi"
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini
index 6bc65e65c..92a7a1cce 100755
--- a/src/locale/it/configure.ini
+++ b/src/locale/it/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "Seleziona Scansione"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "Seleziona Scansione"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = "Unione Scansioni creata!"
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = "Unione Scansioni cancellata!"
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = "Unione Scansioni da cancellare inesistente!"
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "Aggiungi scansione"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "Numero di risultati"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "Peso"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "Azioni"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "Aggiungi Ricerca"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = "Cambiamenti Unione Scansioni effettuati!"
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "Profilo aggiornato!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "C&#039;&egrave; stato un problema nell&#039;aggiornamento Profilo!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "C&#039;&egrave; stato un problema nell&#039;aggiornamento Profilo!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = "Devi usare un percorso assoluto per la Cartella di Lavoro"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "Cartella di Lavoro creata! Potrebbe essere necessario ri-accedere!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "Dai un nome al tuo Robot"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "Cartella di Lavoro e Profilo creati!"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "Impossibile aggiornare il file config.php!"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "Impossibile creare Profilo!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!"
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "Profilo aggiornato!"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "C&#039;&egrave; stato un problema nell&#039;aggiornamento Profilo!"
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "Descrivi il tuo Robot"
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = "PHP Versione 5.4 o maggiore"
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = "File configs/config.php non scrivibile dal web server."
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = "La Cartella di Lavoro deve essere scrivibile dal web server. "
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = "La variabile post_max_size nel file php.ini dovrebbe essere minimo 32M"
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = "I seguenti oggetti richiesti sono mancanti: %s"
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = "I seguenti oggetti opzionali sono mancanti: %s"
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = "Controllo passato."
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = "Usando configs/local_config.php la Cartella di Lavoro sopra potrebbe non funzionare."
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "Password"
 ; SigninView.php line: 109
 signin_view_login = "Accedi"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini
index 8197ae717..61a4daa8f 100755
--- a/src/locale/ja/configure.ini
+++ b/src/locale/ja/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "プロフィールの変更できました。"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "プロフィールの変更できない。"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "プロフィールの変更できない。"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "作業ディレクトリの設定しました。もう一度ログインしてください。"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "ボット名を入力してください。"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "作業ディレクトリとプロフィールの作成しました。"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "config.phpファイルのできない。更新"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "プロフィールを作成できない。"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。"
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "プロフィールの変更できました。"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "プロフィールの変更できない。"
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "ロボットの説明してください。"
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "パスワード"
 ; SigninView.php line: 109
 signin_view_login = "ログイン"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini
index 241d1f14b..926a0c0e5 100755
--- a/src/locale/kn/configure.ini
+++ b/src/locale/kn/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "ಕ್ರಾವ್ಲನ್ನು ಆಯ್ಕೆ ಮಾಡಿ"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = "ಕ್ರಾವ್ಲಗಳ ಮಿಶ್ರಣ ಸೃಜಿಸಲಾಯಿತು"
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = "ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಳಿಸಲಾಗಿದೆ"
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = "ಅಳಿಸಬೇಕಾದ ಕ್ರಾವ್ಲ ಮಿಶ್ರಣ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "ಕ್ರಾವ್ಲಗಳನ್ನು ಸೇರಿಸಿ"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "ಫಲಿತಾಂಶಗಳ ಸಂಖ್ಯೆ"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "ಗೌರವ"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "ಕ್ರಿಯೆಗಳು"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "ಪ್ರಶ್ನೆಯನ್ನು ಸೇರಿಸು"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = "ಕ್ರಾವ್ಲ್ ಮಿಶ್ರಣದಲ್ಲಿ ಬದಲಾವಣೆಯನ್ನು ಉಳಿಸು"
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ನಿಗದಿಪಡಿಸಲಾಗಿದೆ!  ನೀವು ಮರು ಪ್ರವೇಶಿಸಬೇಕಾಗಬಹುದು"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = "configs/config.php ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಲ್ಲ"
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆ ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಾಗಿರಬೇಕು"
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = "php.ini ಕಡಿತದ ಚರಾಂಶ post_max_size ಕನಿಷ್ಠ ಪಕ್ಷ ೧೬ ಎಂ.ಬಿ. ಇರಬೇಕು"
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = "ಬರುವ ಅವಶ್ಯಕವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:"
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = "ಬರುವ ಕಡ್ಡಾಯವಲ್ಲದ ವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:"
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = "ಪರಿಶೀಲನೆ ತೇರ್ಗಡೆಯಾಗಿದೆ"
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = "configs/local_config.php ಉಪಯೋಗದಲ್ಲಿದೆ, ಅದರಿಂದ ಮೇಲಿನ ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ಬದಲಾವಣೆ ನಿಷ್ಕ್ರಿಯವಾಗಬಹುದು "
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "ಪ್ರವೇಶ ಪದ"
 ; SigninView.php line: 109
 signin_view_login = "ಒಳಪ್ರವೇಶಿಸಿ"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini
index 220875f93..b190c6eb8 100755
--- a/src/locale/ko/configure.ini
+++ b/src/locale/ko/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "프로필을 업데이트 했습니다."
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다."
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다."
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "작업 디렉토리가 지정 됐습니다. 다시 로그인이 필요할수 있습니다."
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "로봇 이름을 정해 주십시요."
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "작업 디렉토리와 프로필이 생성됐습니다."
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "config.php 파일을  업데이트 실패했습니다."
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "프로필을 생성할수 없습니다."
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다."
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다."
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "프로필을 업데이트 했습니다."
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다."
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "당신의 로봇을 기술해 주십시요."
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "비밀 번호"
 ; SigninView.php line: 109
 signin_view_login = "로그인"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini
index d0f8be831..f58539143 100644
--- a/src/locale/nl/configure.ini
+++ b/src/locale/nl/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = "Geen lid is of kan die groep niet lezen. Ove
 ; SocialComponent.php line: 1506
 social_component_no_group_access = "Geen lid is of kan die groep niet lezen. Overschakelen op openbare groep!"
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = "standaard"
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = "pagina Alias"
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = "Lijst media"
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = "presentatie"
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = "solide"
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = "Binnen"
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = "geen"
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = "Ontbrekende velden!"
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = "Wiki pagina is bewerkt Sinds Uw versie. Laden Changed versie!"
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = " %s Wiki pagina gemaakt!"
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = "Bespreek de pagina in deze thread!"
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = "Opgeslagen!"
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = "Resource Deleted!"
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = "Resource niet verwijderd!"
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = "Resource Omgedoopt!"
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = "Bron niet Omgedoopt!"
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = "Moeten Pagina opslaan Voordat gebruik van middelen!"
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = " %s Wiki pagina gemaakt!"
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = "Bespreek de pagina in deze thread!"
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = "Resource geupload!"
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = "Upload Fout!"
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = "terug"
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = "Historische versie van %s van %s."
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = "terug"
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = " %s lijn verschillen tussen %s en %s."
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = "Wiki pagina is bewerkt Sinds Uw versie. Laden Changed versie!"
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = "Terugkeren naar %s."
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = "Pagina bekeerd!"
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = "Fout terugzet pagina!"
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = "hoofd-"
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = "klein"
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = "medium"
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = "groot"
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = "grootte"
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = "Kopregel:"
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = "voorbeeld"
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = "tabel Titel"
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = "voorleggen"
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = "annuleren"
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = "Vette tekst"
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = "cursieve tekst"
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = "onderstreepte tekst"
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = "doorgehaalde tekst"
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = "titel"
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = "Rubriek 1"
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = "Rubriek 2"
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = "Rubriek 3"
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = "Rubriek 4"
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = "Ongeordende lijst object"
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = "Bestelde item in de lijst"
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = "Plaats hier de niet-opgemaakte tekst"
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = "Voeg Search Bar Vorm"
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = "grootte"
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = "Voeg Wiki Tabel"
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = "Column Count:"
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = "Rij Count:"
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = "Hyperlink toevoegen"
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = "tekst:"
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = "URL:"
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = "Zoek plaatsaanduidingstekst"
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = "Deze tekst is gecentreerd."
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = "Deze tekst is rechts uitgelijnd."
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = "Deze tekst is links uitgelijnd."
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = "item"
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = "definitie"
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = "titel"
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = "slide Item"
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = "Resource Description voor"
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "Selecteer Crawl"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = "standaard Crawl"
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "Selecteer Crawl"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = "standaard Crawl"
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = "Crawl Mix Gemaakt!"
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = "Meng Naam in Use of ongeldig!"
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = "Ongeldige Timestamp!"
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = "Crawl Mix Deleted!"
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = "Mengen om te verwijderen bestaat niet!"
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = "Meng ge&iuml;mporteerd!"
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = "Instellen Crawl om te gebruiken als Index"
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = "Fout in commentaar data!"
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = "Shared Mix heeft een ongeldige tijdstempel"
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = "Kan niet posten naar die groep!"
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = "Probeer deze crawl mix!"
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = " %s is het delen van de crawl mix %s!"
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = "Draad Gemaakt!"
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = "Ongeldige Timestamp!"
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = "Niet Meng de eigenaar!"
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "Voeg Crawls"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "resultaten getoond"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = "verwijderen"
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "gewicht"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = "naam"
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = "trefwoorden"
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "acties"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "Zoekopdracht toevoegen"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = "verwijderen"
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = "Too Many Zoekresultaat Fragmenten!"
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = "Crawl Mix Wijzigingen opgeslagen!"
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = "hash Captcha"
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = "Captcha image"
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = "normale Authenticatie"
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = "ZKP Authenticatie"
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = "normale Authenticatie"
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = "Instellingen Bijgewerkt!"
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = "Geen instellingen werden veranderd!"
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = "Geen Resource Folder!"
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = "Ongeldige File Type!"
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = "Bestand te groot!"
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "Profiel ge&iuml;pdatet!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "Er was een probleem updaten profiel!"
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = "Reset voltooid"
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "Er was een probleem updaten profiel!"
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = "Moet een absoluut pad voor Werk Directory te gebruiken"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = "Werk Directory kan niet worden opgenomen in Yioop folder!"
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "Werken Directory Set! Het kan nodig zijn om opnieuw in te loggen!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "Gelieve Naam Je robot"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "Working Directory en Profile Gemaakt!"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "Niet in staat om config.php bestand bij te werken!"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "Kan geen profiel maak!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "Werk is ongeldig! Kan profiel niet maken!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "Werk is ongeldig! Kan profiel niet maken!"
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "Profiel ge&iuml;pdatet!"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "Er was een probleem updaten profiel!"
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "Beschrijf uw Robot"
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = "PHP versie 5.4 of nieuwer"
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = "configs / config.php niet webserver beschrijfbaar."
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = "Werk map moet beschrijfbaar door web-server te zijn."
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = "php.ini bestand variabele post_max_size moet minstens 2M"
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = "De volgende benodigde onderdelen ontbraken: %s"
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = "De volgende optionele onderdelen ontbraken: %s"
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = "Controleer Geslaagd."
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = "Met behulp van configs / local_config.php dus veranderende werk directory hierboven kan niet werken."
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = "Niet in staat om rekening te herstel
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = "Recover e-mail al gebruikt!"
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = "Recover e-mail is verlopen!"
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = "Wachtwoord veranderd!"
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = "Wachtwoorden komen niet overeen!"
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = "Recover e-mail al gebruikt!"
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = "Recover e-mail is verlopen!"
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = "Formaat van URL is ongeldig!"
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = "Starred velden moeten correct worden ingevuld!"
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = "Hash-code niet overeen!"
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = "Kreeg de menselijke controle vragen verkeerd!"
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = "Captcha Mis-aangegaan!"
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = "Suggereren URL buffer vol is! Probeer het later opnieuw!"
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = "Gesuggereerd URL gered!"
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = "Cookies moeten worden ingeschakeld om te registreren of log in om een Yioop!"
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = "Kreeg de menselijke controle vragen verkeerd!"
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = "Captcha Mis-aangegaan!"
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = "Hash-code niet overeen!"
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = "Starred velden moeten correct worden ingevuld!"
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = "Controleer e-mailadres!"
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = "Geen account aangemaakt - Gebruikersnaam al in gebruik!!"
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = "captcha Type"
 ; SecurityElement.php line: 103
 security_element_save = "Opslaan"
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = "Opslaan"
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = "Captcha and Recovery Vragen"
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = "Wijzig Account Recovery Vragen"
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = "Tekst bewerken Captcha Vragen"
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = "Wijzig Account Recovery Vragen"
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = "Tekst bewerken Captcha Vragen"
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = "Middelen zijn afbeeldingen, videos of bestanden d
 ; WikiElement.php line: 525
 wiki_element_rename_failed = "Hernoemen mislukt!"
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = "andere naam geven"
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = "Toevoegen aan pagina"
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = "Geen middelen zijn nog naar deze pagina opgeslagen."
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = " %s Groep Wiki Pagina Lijst"
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = "Zoek groep paginatitels"
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = "gaan"
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = "Pagina aanmaken: %s"
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = "Verwijst door naar:"
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = "Deze groep heeft nog geen paginas voor de %s locale. Zoeken naar een nonexistant pagina en klik op Bewerken om het te maken."
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = "terug"
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = "verschil:"
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = "gaan"
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = "eerste"
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = "tweede"
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = "eerste"
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = "tweede"
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = "Bewerkt door %s."
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = "( %s bytes)."
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = "terugkeren"
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = "terugkeren"
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = "Typ het wachtwoord opnieuw:"
 ; RecoverView.php line: 131
 recover_view_username = "gebruikersnaam:"
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = "Herstel Info:"
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = "Human Check:"
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = "Human Check:"
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = "Recover account"
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "wachtwoord"
 ; SigninView.php line: 109
 signin_view_login = "Log In"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = "Wachtwoord Vergeten?"
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = "Maak Een Account Aan"
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/nl/statistics.txt b/src/locale/nl/statistics.txt
index aed3602f7..0270fb155 100644
--- a/src/locale/nl/statistics.txt
+++ b/src/locale/nl/statistics.txt
@@ -1 +1 @@
-d:90;
\ No newline at end of file
+d:89;
\ No newline at end of file
diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini
index 5fd3baaa6..74c267c85 100755
--- a/src/locale/pl/configure.ini
+++ b/src/locale/pl/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = ""
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini
index 0ba6932ee..39f6455f9 100755
--- a/src/locale/pt/configure.ini
+++ b/src/locale/pt/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = ""
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini
index 1b084dc0c..7327a6bfc 100755
--- a/src/locale/ru/configure.ini
+++ b/src/locale/ru/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = ""
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini
index 84bb02bfc..7ab03cfe2 100644
--- a/src/locale/te/configure.ini
+++ b/src/locale/te/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = "సభ్యుడు కాదు లేద
 ; SocialComponent.php line: 1506
 social_component_no_group_access = "సభ్యుడు కాదు లేదా ఆ గ్రూప్ ని చదవలేరు.పబ్లిక్ గ్రూప్ కి మార్చండి!"
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = "సగటు"
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = "మీడియా జాబితా"
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = " "
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = "కొన్ని ఫీల్డ్స్ మిస్ అయినవి!"
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = "మీ వెర్షన్ తరువాత వికీ పేజీ సవరించబడింది.మార్చబడిన వెర్షన్ లోడ్ అవుతోంది!"
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = "%s వికీ పేజ్ సృష్టించబడినది!"
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = "ఈ థ్రెడ్ లో పేజీ గురించి చర్చించండి!"
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = "పేజ్ సేవ్ చేయబడినది!"
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = "రిసోర్స్ డిలీట్ చేయబడినది!"
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = "రిసోర్స్ డిలీట్ చేయబడలేదు!"
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = "రిసోర్స్ పేరు మార్చబడింది!"
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = "రిసోర్స్ పేరు మార్చలేదు!"
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = "రిసోర్సెస్ వాడే ముందు పేజ్ సేవ్ చేయాలి!"
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = "%s వికీ పేజ్ సృష్టించబడినది!"
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = "ఈ థ్రెడ్ లో పేజీ గురించి చర్చించండి!"
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = "రిసోర్స్ అప్ లోడ్ అయినది!"
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = "అప్ లోడ్ పొరపాటు"
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = "వెనుకకు"
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = "చారిత్రక వెర్షన్ %s నుండి %s."
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = "వెనుకకు"
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = "%s లైన్ తేడాలు%s మరియు %s మధ్"
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = "మీ వెర్షన్ తరువాత వికీ పేజీ సవరించబడింది.మార్చబడిన వెర్షన్ లోడ్ అవుతోంది!"
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = "తిరిగి వెనుకకు %s"
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = "పేజీ వెనుకకు మార్చబడింది!&quot;"
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = "పేజీ వెనుకకు మార్చుటలో లోపం!"
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = "ప్రధాన"
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = "చిన్న"
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = "మధ్యస్థం"
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = "పెద్ద"
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = "పరిమాణం"
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = "శీర్షిక పంక్తి:"
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = "ఉదాహరణ"
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = "టేబుల్ పేరు"
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = "మనవి చేయి"
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = "రద్దు చెయ్యి"
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = "బోల్డ్ టెక్స్ట్"
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = "ఇటాలిక్ టెక్స్ట్"
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = "అండర్ లైన్డ్ టెక్స్ట్"
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = "స్ట్రైక్డ్ టెక్స్ట్"
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = "హెడ్డింగ్"
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = "లెవెల్ 1 హెడ్డింగ్"
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = "లెవెల్ 2 హెడ్డింగ్"
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = "లెవెల్ 3 హెడ్డింగ్"
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = "లెవెల్ 4 హెడ్డింగ్"
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = "క్రమం లేని జాబితా అంశం"
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = "క్రమంలో జాబితా అంశం"
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = "ఇక్కడ ఫార్మాట్ చేయని టెక్స్ట్ ఇన్సర్ట్ చేయండి"
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = "శోధన రూపం జోడించండి"
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = "పరిమాణం"
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = "వికీ టేబుల్ ఆడ్ చెయ్యండి "
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = "కాలమ్ కౌంట్:"
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = "వరుస కౌంట్:"
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = "హైపర్ లింక్ ఆడ్ చెయ్యండి"
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = "టెక్స్ట్:"
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = "యుఆర్ఎల్:"
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = "ప్లేస్ హోల్డర్ టెక్స్ట్ శోధన"
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = "ఈ టెక్స్ట్ మధ్య సమలేఖనమైంది."
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = "ఈ టెక్స్ట్ కుడి సమలేఖనమైంది. "
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = "ఈ టెక్స్ట్ ఎడమ సమలేఖనమైంది."
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = "అంశము"
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = "నిర్వచనం"
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = "శీర్షిక"
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = "స్లయిడ్ అంశము"
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "క్రాల్ ఎంచుకోండి"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = "డిఫాల్ట  క్రాల్"
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "క్రాల్ ఎంచుకోండి"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = "డిఫాల్ట  క్రాల్"
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = "క్రాల్ మిక్స్ సృష్టించబడినది!"
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = "మిక్స్ పేరు వాడుక లో వుంది లేదా చెల్లదు!"
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = "టైం స్టాంప్ వేలిడ్ కాదు!"
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = "క్రాల్ మిక్స్ డిలీట్ చేయబడినది!"
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = "తొలగించవలసిన మిక్స్ లేదు!"
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = "మిక్స్ విజయవంతంగా దిగుమతి చేయబడినది!"
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = "సూచికగా ఉపయోగించడానికి క్రాల్ సెట్ చేస్తోంది  "
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = "వ్యాఖ్య డేటాలో పొరపాటు ఉన్నది!"
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = "షేర్డ్ మిక్స్ టైమ్ స్టాంప్ చెల్లదు"
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = "ఆ గ్రూప్ కు పోస్ట్ చెయ్యలేరు!"
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = "ఈ క్రాల్ మిక్స్ ప్రయత్నించండి!"
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = "%s పంచుకుంటున్నారు  క్రాల్ మిక్స్%sని!"
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = "థ్రెడ్ సృష్టించబడినది!"
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = "టైం స్టాంప్ వేలిడ్ కాదు!"
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = "మిక్స్ యజమాని కాదు!"
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "క్రాల్ లు జోడించుము"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "ఫలితాలను చూపించాయి"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = "తొలగించు"
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "బరువు"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = "పేరు "
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = "కీ పదాలు"
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "యాక్సన్ లు"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "క్వెరి జోడించుము"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = "తొలగించు"
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = "చాలా శోధన ఫలిత శకలాలు!"
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = "క్రాల్ మిక్స్ మార్పులు సేవ్ చేయబడినవి!"
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = "హాష్ కేప్త్చ"
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = "కేప్త్చ చిత్రం"
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = "సాధారణ ఆతేంటికేషణ్"
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = "ZKP ఆతేంటికేషణ్"
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = "సాధారణ ఆతేంటికేషణ్"
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = "సెట్టింగ్స్ అప్డేట్ చెయ్యబడినవి!"
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = "ఏ సెట్టింగులు మార్చబడలేదు!"
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = "రిసోర్స్ ఫోల్డర్ లేదు!"
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = "చెల్లని ఫైల్ రకం!"
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = "చాలా పెద్ద ఫైలు!"
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "ప్రొఫైల్ అప్డేట్ చేయబడినది!"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "ప్రొఫైల్ నవీకరణలో సమస్య వున్నది! "
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = "రీసెట్ పూర్తి అయినది"
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "ప్రొఫైల్ నవీకరణలో సమస్య వున్నది! "
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = "వర్క్ డైరెక్టరీ కోసం సరైన పాత్ ఉపయోగించాలి"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = "వర్క్ డైరెక్టరీ yioop ఫోల్డర్ లో ఉండకూడదు!"
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "వర్క్ డైరెక్టరీ సెట్  చేయండి! మీరు తిరిగి లాగిన్ చేయాలి!"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "దయచేసి మీ రోబోట్ కి పేరు పెట్టండి"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "వర్కింగ్ డైరెక్టరీ మరియు ప్రొఫైల్ క్రియేట్ చేయబడినది!"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "config.php ఫైల్ అప్డేట్ చేయుట సాధ్యపడలేదు!"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "ప్రొఫైల్ తయారు చేయుట సాధ్యపడలేదు!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "వర్క్ డైరెక్టరీ చెల్లదు! ప్రొఫైల్ సృష్టించలేరు!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "వర్క్ డైరెక్టరీ చెల్లదు! ప్రొఫైల్ సృష్టించలేరు!"
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "ప్రొఫైల్ అప్డేట్ చేయబడినది!"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "ప్రొఫైల్ నవీకరణలో సమస్య వున్నది! "
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "మీ రోబోట్ ని దయచేసి వివరించండి"
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = "PHP వెర్షన్ 5.4 లేదా ఇంకా క్రొత్తది"
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = "క్రింది అవసరమైన అంశాలు మిస్ అయినవి: %s"
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = "క్రింది ఆప్షనల్ అంశాలు మిస్ అయినవి: %s"
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = "ఖాతా పునరుద్
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = "పునరుద్ధరన ఇమెయిల్ ఇదివరకే వాడబడినది!"
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = "పునరుద్ధరన ఇమెయిల్ గడువు ముగిసింది!"
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = "పాస్ వర్డ్ మార్చబడినది!"
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = "పాస్ వర్డ్స్ సరిపోలడం లేదు!"
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = "పునరుద్ధరన ఇమెయిల్ ఇదివరకే వాడబడినది!"
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = "పునరుద్ధరన ఇమెయిల్ గడువు ముగిసింది!"
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = "యుఆర్ఎల్ యొక్క ఫార్మాట్ చెల్లదు!"
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = "స్టార్ ఉన్న ఫీల్డ్స్ తప్పని సరిగా పూర్తి చేయాలి!"
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = "హాష్ కోడ్ సరిపోలడం లేదు!"
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = "మానవ చెక్ ప్రశ్నలు తప్పు వచ్చాయి!"
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = "కాప్చ సరికాదు!"
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = "సూచించిన యుఆర్ఎల్ బఫర్ నిండి పోయినది. దయచేసి కాసేపు ఆగి మరలా ప్రయత్నించండి!"
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = "సూచించిన యుఆర్ఎల్ సేవ్ చేయబడినది!"
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = "మానవ చెక్ ప్రశ్నలు తప్పు వచ్చాయి!"
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = "కాప్చ సరికాదు!"
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = "హాష్ కోడ్ సరిపోలడం లేదు!"
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = "స్టార్ ఉన్న ఫీల్డ్స్ తప్పని సరిగా పూర్తి చేయాలి!"
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = "ఇ-మెయిల్ చిరునామా మరోసారి పరిశీలించండి! "
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = "ఖాతా సృస్టించలేదు - యూజర్ పేరు వాడుకలో వున్నది!!"
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = "సేవ్ చేయి"
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = "సేవ్ చేయి"
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = "పేరు మార్పు విఫలమైనది!"
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = "పేరుమార్చండి"
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = "పేజీకి జోడించండి"
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = "%s గ్రూప్ వికీ పేజీ జాబితా"
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = "గ్రూప్ పేజి పేర్లను శోధించు"
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = "పేజీ సృష్టించు: %s"
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = "పాస్&zwnj;వర్డ్ మరలా
 ; RecoverView.php line: 131
 recover_view_username = "యూజర్ పేరు:"
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "పాస్&zwnj;వర్డ్ "
 ; SigninView.php line: 109
 signin_view_login = "లాగ్ ఇన్"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = "పాస్&zwnj;వర్డ్ మర్చిపోయారా?"
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini
index f2d12c1c9..05dce2438 100755
--- a/src/locale/th/configure.ini
+++ b/src/locale/th/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = ""
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini
index 8e8ca3226..4c49316fc 100755
--- a/src/locale/tr/configure.ini
+++ b/src/locale/tr/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = ""
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = ""
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = ""
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = ""
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = ""
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = ""
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = ""
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = ""
 ; SigninView.php line: 109
 signin_view_login = ""
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini
index 02fcb15d3..a7acb1192 100755
--- a/src/locale/vi_VN/configure.ini
+++ b/src/locale/vi_VN/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "Chọn thu thập th&ocirc;ng tin"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "Chọn thu thập th&ocirc;ng tin"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = "Tạo ra hỗn hợp "
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = "X&oacute;a kết hợp "
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = "Kết hợp n&agrave;y kh&ocirc;ng tồn tại"
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "Cộng th&ecirc;m thu thập"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "Số kết quả"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "Trọng lượng"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "H&agrave;nh động"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "Cộng th&ecirc;m truy vấn"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = "Kết hợp đ&atilde; được lưu dữ"
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = "Hồ sơ được cập nhật"
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = "C&oacute; sự trở ngaị về việc cập nhật hồ sơ "
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = "C&oacute; sự trở ngaị về việc cập nhật hồ sơ "
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = ""
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "C&ocirc;ng việc thiết lập thư mục bị đ&ocirc;ng cứng (Bạn c&oacute; thể cần phải đăng nhập)"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "Đặt t&ecirc;n cho r&ocirc; b&ocirc; của bạn"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "Thư mục l&agrave;m việc v&agrave; hồ sơ được tạo ra"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "Kh&ocirc;ng thể cập nhật hồ sơ config.php"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "Kh&ocirc;ng thể tạo hồ sơ"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = "C&ocirc;ng t&aacute;c thư mục kh&ocirc;ng hợp lệ"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = "C&ocirc;ng t&aacute;c thư mục kh&ocirc;ng hợp lệ"
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = "Hồ sơ được cập nhật"
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = "C&oacute; sự trở ngaị về việc cập nhật hồ sơ "
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = "Diễn tả r&ocirc; b&ocirc; của bạn"
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = "Kiểm tra được th&ocirc;ng qua"
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "Mật khẩu"
 ; SigninView.php line: 109
 signin_view_login = "Đăng nhập"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini
index 09afd9836..d2f09c3f8 100755
--- a/src/locale/zh_CN/configure.ini
+++ b/src/locale/zh_CN/configure.ini
@@ -924,298 +924,298 @@ social_component_no_group_access = ""
 ; SocialComponent.php line: 1506
 social_component_no_group_access = ""
 ;
-; SocialComponent.php line: 1530
+; SocialComponent.php line: 1531
 social_component_standard_page = ""
 ;
-; SocialComponent.php line: 1531
+; SocialComponent.php line: 1532
 social_component_page_alias = ""
 ;
-; SocialComponent.php line: 1532
+; SocialComponent.php line: 1533
 social_component_media_list = ""
 ;
-; SocialComponent.php line: 1533
+; SocialComponent.php line: 1534
 social_component_presentation = ""
 ;
-; SocialComponent.php line: 1536
+; SocialComponent.php line: 1537
 social_component_solid = ""
 ;
-; SocialComponent.php line: 1537
+; SocialComponent.php line: 1538
 social_component_dashed = ""
 ;
-; SocialComponent.php line: 1538
+; SocialComponent.php line: 1539
 social_component_none = ""
 ;
-; SocialComponent.php line: 1577
+; SocialComponent.php line: 1578
 social_component_missing_fields = ""
 ;
-; SocialComponent.php line: 1583
+; SocialComponent.php line: 1584
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1633
+; SocialComponent.php line: 1648
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1634
+; SocialComponent.php line: 1649
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1639
+; SocialComponent.php line: 1669
 social_component_page_saved = ""
 ;
-; SocialComponent.php line: 1651
+; SocialComponent.php line: 1681
 social_component_resource_deleted = ""
 ;
-; SocialComponent.php line: 1656
+; SocialComponent.php line: 1686
 social_component_resource_not_deleted = ""
 ;
-; SocialComponent.php line: 1673
+; SocialComponent.php line: 1703
 social_component_resource_renamed = ""
 ;
-; SocialComponent.php line: 1678
+; SocialComponent.php line: 1708
 social_component_resource_not_renamed = ""
 ;
-; SocialComponent.php line: 1688
+; SocialComponent.php line: 1718
 social_component_resource_save_first = ""
 ;
-; SocialComponent.php line: 1700
+; SocialComponent.php line: 1730
 social_component_page_created = ""
 ;
-; SocialComponent.php line: 1702
+; SocialComponent.php line: 1732
 social_component_page_discuss_here = ""
 ;
-; SocialComponent.php line: 1706
+; SocialComponent.php line: 1736
 social_component_resource_uploaded = ""
 ;
-; SocialComponent.php line: 1711
+; SocialComponent.php line: 1741
 social_component_upload_error = ""
 ;
-; SocialComponent.php line: 1758
+; SocialComponent.php line: 1788
 social_component_back = ""
 ;
-; SocialComponent.php line: 1759
+; SocialComponent.php line: 1789
 social_component_history_page = ""
 ;
-; SocialComponent.php line: 1794
+; SocialComponent.php line: 1824
 social_component_back = ""
 ;
-; SocialComponent.php line: 1795
+; SocialComponent.php line: 1825
 social_component_diff_page = ""
 ;
-; SocialComponent.php line: 1809
+; SocialComponent.php line: 1839
 social_component_wiki_edited_elsewhere = ""
 ;
-; SocialComponent.php line: 1817
+; SocialComponent.php line: 1847
 social_component_page_revert_to = ""
 ;
-; SocialComponent.php line: 1821
+; SocialComponent.php line: 1851
 social_component_page_reverted = ""
 ;
-; SocialComponent.php line: 1825
+; SocialComponent.php line: 1855
 social_component_revert_error = ""
 ;
-; SocialComponent.php line: 1896
+; SocialComponent.php line: 1926
 social_component_main = ""
 ;
-; SocialComponent.php line: 2142
+; SocialComponent.php line: 2172
 wiki_js_small = ""
 ;
-; SocialComponent.php line: 2143
+; SocialComponent.php line: 2173
 wiki_js_medium = ""
 ;
-; SocialComponent.php line: 2144
+; SocialComponent.php line: 2174
 wiki_js_large = ""
 ;
-; SocialComponent.php line: 2145
+; SocialComponent.php line: 2175
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2146
+; SocialComponent.php line: 2176
 wiki_js_prompt_heading = ""
 ;
-; SocialComponent.php line: 2147
+; SocialComponent.php line: 2177
 wiki_js_example = ""
 ;
-; SocialComponent.php line: 2148
+; SocialComponent.php line: 2178
 wiki_js_table_title = ""
 ;
-; SocialComponent.php line: 2149
+; SocialComponent.php line: 2179
 wiki_js_submit = ""
 ;
-; SocialComponent.php line: 2150
+; SocialComponent.php line: 2180
 wiki_js_cancel = ""
 ;
-; SocialComponent.php line: 2151
+; SocialComponent.php line: 2181
 wiki_js_bold = ""
 ;
-; SocialComponent.php line: 2152
+; SocialComponent.php line: 2182
 wiki_js_italic = ""
 ;
-; SocialComponent.php line: 2153
+; SocialComponent.php line: 2183
 wiki_js_underline = ""
 ;
-; SocialComponent.php line: 2154
+; SocialComponent.php line: 2184
 wiki_js_strike = ""
 ;
-; SocialComponent.php line: 2155
+; SocialComponent.php line: 2185
 wiki_js_heading = ""
 ;
-; SocialComponent.php line: 2156
+; SocialComponent.php line: 2186
 wiki_js_heading1 = ""
 ;
-; SocialComponent.php line: 2157
+; SocialComponent.php line: 2187
 wiki_js_heading2 = ""
 ;
-; SocialComponent.php line: 2158
+; SocialComponent.php line: 2188
 wiki_js_heading3 = ""
 ;
-; SocialComponent.php line: 2159
+; SocialComponent.php line: 2189
 wiki_js_heading4 = ""
 ;
-; SocialComponent.php line: 2160
+; SocialComponent.php line: 2190
 wiki_js_bullet = ""
 ;
-; SocialComponent.php line: 2161
+; SocialComponent.php line: 2191
 wiki_js_enum = ""
 ;
-; SocialComponent.php line: 2162
+; SocialComponent.php line: 2192
 wiki_js_nowiki = ""
 ;
-; SocialComponent.php line: 2163
+; SocialComponent.php line: 2193
 wiki_js_add_search = ""
 ;
-; SocialComponent.php line: 2164
+; SocialComponent.php line: 2194
 wiki_js_search_size = ""
 ;
-; SocialComponent.php line: 2165
+; SocialComponent.php line: 2195
 wiki_js_add_wiki_table = ""
 ;
-; SocialComponent.php line: 2166
+; SocialComponent.php line: 2196
 wiki_js_for_table_cols = ""
 ;
-; SocialComponent.php line: 2167
+; SocialComponent.php line: 2197
 wiki_js_for_table_rows = ""
 ;
-; SocialComponent.php line: 2168
+; SocialComponent.php line: 2198
 wiki_js_add_hyperlink = ""
 ;
-; SocialComponent.php line: 2169
+; SocialComponent.php line: 2199
 wiki_js_link_text = ""
 ;
-; SocialComponent.php line: 2170
+; SocialComponent.php line: 2200
 wiki_js_link_url = ""
 ;
-; SocialComponent.php line: 2171
+; SocialComponent.php line: 2201
 wiki_js_placeholder = ""
 ;
-; SocialComponent.php line: 2172
+; SocialComponent.php line: 2202
 wiki_js_centeraligned = ""
 ;
-; SocialComponent.php line: 2173
+; SocialComponent.php line: 2203
 wiki_js_rightaligned = ""
 ;
-; SocialComponent.php line: 2174
+; SocialComponent.php line: 2204
 wiki_js_leftaligned = ""
 ;
-; SocialComponent.php line: 2176
+; SocialComponent.php line: 2206
 wiki_js_definitionlist_item = ""
 ;
-; SocialComponent.php line: 2178
+; SocialComponent.php line: 2208
 wiki_js_definitionlist_definition = ""
 ;
-; SocialComponent.php line: 2180
+; SocialComponent.php line: 2210
 wiki_js_slide_sample_title = ""
 ;
-; SocialComponent.php line: 2182
+; SocialComponent.php line: 2212
 wiki_js_slide_sample_bullet = ""
 ;
-; SocialComponent.php line: 2184
+; SocialComponent.php line: 2214
 wiki_js_slide_resource_description = ""
 ;
-; SocialComponent.php line: 2222
+; SocialComponent.php line: 2252
 social_component_select_crawl = "搜尋選擇"
 ;
-; SocialComponent.php line: 2223
+; SocialComponent.php line: 2253
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2225
+; SocialComponent.php line: 2255
 social_component_select_crawl = "搜尋選擇"
 ;
-; SocialComponent.php line: 2227
+; SocialComponent.php line: 2257
 social_component_default_crawl = ""
 ;
-; SocialComponent.php line: 2257
+; SocialComponent.php line: 2287
 social_component_mix_created = ""
 ;
-; SocialComponent.php line: 2260
+; SocialComponent.php line: 2290
 social_component_invalid_name = ""
 ;
-; SocialComponent.php line: 2268
+; SocialComponent.php line: 2298
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2272
+; SocialComponent.php line: 2302
 social_component_mix_deleted = ""
 ;
-; SocialComponent.php line: 2291
+; SocialComponent.php line: 2321
 social_component_mix_doesnt_exists = ""
 ;
-; SocialComponent.php line: 2299
+; SocialComponent.php line: 2329
 social_component_mix_imported = ""
 ;
-; SocialComponent.php line: 2313
+; SocialComponent.php line: 2343
 social_component_set_index = ""
 ;
-; SocialComponent.php line: 2322
+; SocialComponent.php line: 2352
 social_component_comment_error = ""
 ;
-; SocialComponent.php line: 2328
+; SocialComponent.php line: 2358
 social_component_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2346
+; SocialComponent.php line: 2376
 social_component_no_post_access = ""
 ;
-; SocialComponent.php line: 2350
+; SocialComponent.php line: 2380
 social_component_share_title = ""
 ;
-; SocialComponent.php line: 2352
+; SocialComponent.php line: 2382
 social_component_share_description = ""
 ;
-; SocialComponent.php line: 2357
+; SocialComponent.php line: 2387
 social_component_thread_created = ""
 ;
-; SocialComponent.php line: 2408
+; SocialComponent.php line: 2438
 social_component_mix_invalid_timestamp = ""
 ;
-; SocialComponent.php line: 2413
+; SocialComponent.php line: 2443
 social_component_mix_not_owner = ""
 ;
-; SocialComponent.php line: 2423
+; SocialComponent.php line: 2453
 social_component_add_crawls = "增加索引"
 ;
-; SocialComponent.php line: 2425
+; SocialComponent.php line: 2455
 social_component_num_results = "結果數量"
 ;
-; SocialComponent.php line: 2427
+; SocialComponent.php line: 2457
 social_component_del_frag = ""
 ;
-; SocialComponent.php line: 2429
+; SocialComponent.php line: 2459
 social_component_weight = "元素重量"
 ;
-; SocialComponent.php line: 2430
+; SocialComponent.php line: 2460
 social_component_name = ""
 ;
-; SocialComponent.php line: 2432
+; SocialComponent.php line: 2462
 social_component_add_keywords = ""
 ;
-; SocialComponent.php line: 2434
+; SocialComponent.php line: 2464
 social_component_actions = "元素活動"
 ;
-; SocialComponent.php line: 2436
+; SocialComponent.php line: 2466
 social_component_add_query = "增加查詢"
 ;
-; SocialComponent.php line: 2437
+; SocialComponent.php line: 2467
 social_component_delete = ""
 ;
-; SocialComponent.php line: 2487
+; SocialComponent.php line: 2517
 social_component_too_many_fragments = ""
 ;
-; SocialComponent.php line: 2498
+; SocialComponent.php line: 2528
 social_component_mix_saved = ""
 ;
 ; SystemComponent.php line: 82
@@ -1320,100 +1320,109 @@ captchasettings_element_hash_captcha = ""
 ; SystemComponent.php line: 708
 captchasettings_element_image_captcha = ""
 ;
-; SystemComponent.php line: 713
+; SystemComponent.php line: 712
+captchasettings_element_no_recovery = ""
+;
+; SystemComponent.php line: 714
+captchasettings_element_email_recovery = ""
+;
+; SystemComponent.php line: 716
+captchasettings_element_email_questions = ""
+;
+; SystemComponent.php line: 721
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 715
+; SystemComponent.php line: 723
 serversettings_element_zkp_authentication = ""
 ;
-; SystemComponent.php line: 720
+; SystemComponent.php line: 728
 serversettings_element_normal_authentication = ""
 ;
-; SystemComponent.php line: 744
+; SystemComponent.php line: 757
 system_component_settings_updated = ""
 ;
-; SystemComponent.php line: 747
+; SystemComponent.php line: 760
 system_component_no_update_settings = ""
 ;
-; SystemComponent.php line: 788
+; SystemComponent.php line: 802
 system_component_no_resource_folder = ""
 ;
-; SystemComponent.php line: 802
+; SystemComponent.php line: 816
 system_component_invalid_filetype = ""
 ;
-; SystemComponent.php line: 807
+; SystemComponent.php line: 821
 system_component_file_too_big = ""
 ;
-; SystemComponent.php line: 822
+; SystemComponent.php line: 836
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 826
+; SystemComponent.php line: 840
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 875
+; SystemComponent.php line: 889
 system_component_configure_reset_completed = ""
 ;
-; SystemComponent.php line: 878
+; SystemComponent.php line: 892
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 957
+; SystemComponent.php line: 971
 system_component_configure_use_absolute_path = "使用絕對路徑"
 ;
-; SystemComponent.php line: 962
+; SystemComponent.php line: 976
 system_component_configure_configure_diff_base_dir = ""
 ;
-; SystemComponent.php line: 993
+; SystemComponent.php line: 1007
 system_component_configure_work_dir_set = "工作目錄配置"
 ;
-; SystemComponent.php line: 1004
+; SystemComponent.php line: 1018
 system_component_name_your_bot = "取名"
 ;
-; SystemComponent.php line: 1026
+; SystemComponent.php line: 1040
 system_component_configure_work_profile_made = "工作設置已建立"
 ;
-; SystemComponent.php line: 1030
+; SystemComponent.php line: 1044
 system_component_configure_no_set_config = "無設置"
 ;
-; SystemComponent.php line: 1037
+; SystemComponent.php line: 1051
 system_component_configure_no_create_profile = "未建立簡歷"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1058
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1065
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1080
+; SystemComponent.php line: 1094
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1084
+; SystemComponent.php line: 1098
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1104
+; SystemComponent.php line: 1118
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1158
+; SystemComponent.php line: 1172
 system_component_php_version = "PHP版本"
 ;
-; SystemComponent.php line: 1166
+; SystemComponent.php line: 1180
 system_component_no_write_config_php = "PHP未寫入"
 ;
-; SystemComponent.php line: 1171
+; SystemComponent.php line: 1185
 system_component_no_write_work_dir = "未寫入目錄"
 ;
-; SystemComponent.php line: 1176
+; SystemComponent.php line: 1190
 system_component_post_size_small = "張貼小容量"
 ;
-; SystemComponent.php line: 1182
+; SystemComponent.php line: 1196
 system_component_missing_required = "缺少必要項目"
 ;
-; SystemComponent.php line: 1206
+; SystemComponent.php line: 1220
 system_component_missing_optional = "缺少選擇項目"
 ;
-; SystemComponent.php line: 1212
+; SystemComponent.php line: 1226
 system_component_check_passed = "通過檢查"
 ;
-; SystemComponent.php line: 1217
+; SystemComponent.php line: 1231
 system_component_using_local_config = "使用當地語言"
 ;
 ; MachineController.php line: 193
@@ -1482,67 +1491,67 @@ register_controller_account_recover_fail = ""
 ; RegisterController.php line: 550
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 563
+; RegisterController.php line: 564
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 570
+; RegisterController.php line: 571
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 574
+; RegisterController.php line: 575
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 580
+; RegisterController.php line: 581
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 588
+; RegisterController.php line: 589
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 602
+; RegisterController.php line: 603
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 607
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 734
+; RegisterController.php line: 735
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 738
+; RegisterController.php line: 739
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 751
+; RegisterController.php line: 752
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 761
+; RegisterController.php line: 762
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 788
+; RegisterController.php line: 789
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 823
+; RegisterController.php line: 824
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 827
+; RegisterController.php line: 828
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1029
+; RegisterController.php line: 1030
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1035
+; RegisterController.php line: 1036
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1050
+; RegisterController.php line: 1051
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1061
+; RegisterController.php line: 1062
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1089
+; RegisterController.php line: 1090
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1092
+; RegisterController.php line: 1093
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1099
+; RegisterController.php line: 1100
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -3508,19 +3517,25 @@ security_element_captcha_type = ""
 ; SecurityElement.php line: 103
 security_element_save = ""
 ;
-; SecurityElement.php line: 107
+; SecurityElement.php line: 110
+security_element_recovery_type = ""
+;
+; SecurityElement.php line: 123
+security_element_save = ""
+;
+; SecurityElement.php line: 127
 security_element_captcha_recovery_questions = ""
 ;
-; SecurityElement.php line: 113
+; SecurityElement.php line: 133
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 118
+; SecurityElement.php line: 138
 security_element_edit_captcha = ""
 ;
-; SecurityElement.php line: 123
+; SecurityElement.php line: 143
 security_element_edit_recovery = ""
 ;
-; SecurityElement.php line: 126
+; SecurityElement.php line: 146
 security_element_edit_captcha = ""
 ;
 ; ServersettingsElement.php line: 59
@@ -3778,64 +3793,64 @@ wiki_element_resources_info = ""
 ; WikiElement.php line: 525
 wiki_element_rename_failed = ""
 ;
-; WikiElement.php line: 591
+; WikiElement.php line: 592
 wiki_element_rename = ""
 ;
-; WikiElement.php line: 595
+; WikiElement.php line: 596
 wiki_element_add_to_page = ""
 ;
-; WikiElement.php line: 615
+; WikiElement.php line: 616
 wiki_element_no_resources = ""
 ;
-; WikiElement.php line: 637
+; WikiElement.php line: 638
 wiki_view_wiki_page_list = ""
 ;
-; WikiElement.php line: 650
+; WikiElement.php line: 651
 wiki_view_filter_or_create = ""
 ;
-; WikiElement.php line: 652
+; WikiElement.php line: 653
 wiki_element_go = ""
 ;
-; WikiElement.php line: 657
+; WikiElement.php line: 658
 wiki_view_create_page = ""
 ;
-; WikiElement.php line: 668
+; WikiElement.php line: 669
 wiki_element_redirect_to = ""
 ;
-; WikiElement.php line: 690
+; WikiElement.php line: 691
 wiki_view_no_pages = ""
 ;
-; WikiElement.php line: 713
+; WikiElement.php line: 714
 wiki_view_back = ""
 ;
-; WikiElement.php line: 729
+; WikiElement.php line: 730
 wiki_view_difference = ""
 ;
-; WikiElement.php line: 735
+; WikiElement.php line: 736
 wiki_view_go = ""
 ;
-; WikiElement.php line: 754
+; WikiElement.php line: 755
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 756
+; WikiElement.php line: 757
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 760
+; WikiElement.php line: 761
 wiki_view_diff_first = ""
 ;
-; WikiElement.php line: 761
+; WikiElement.php line: 762
 wiki_view_diff_second = ""
 ;
-; WikiElement.php line: 767
+; WikiElement.php line: 768
 wiki_view_edited_by = ""
 ;
-; WikiElement.php line: 771
+; WikiElement.php line: 772
 wiki_view_page_len = ""
 ;
-; WikiElement.php line: 773
+; WikiElement.php line: 774
 wiki_view_revert = ""
 ;
-; WikiElement.php line: 776
+; WikiElement.php line: 777
 wiki_view_revert = ""
 ;
 ; GroupView.php line: 82
@@ -4085,19 +4100,19 @@ register_view_retypepassword = ""
 ; RecoverView.php line: 131
 recover_view_username = ""
 ;
-; RecoverView.php line: 146
+; RecoverView.php line: 147
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 153
+; RecoverView.php line: 157
 register_view_human_check = ""
 ;
-; RecoverView.php line: 185
+; RecoverView.php line: 189
 register_view_human_check = ""
 ;
-; RecoverView.php line: 202
+; RecoverView.php line: 206
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 211
+; RecoverView.php line: 215
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4397,13 +4412,13 @@ signin_view_password = "密碼"
 ; SigninView.php line: 109
 signin_view_login = "登入"
 ;
-; SigninView.php line: 124
+; SigninView.php line: 125
 signin_view_recover_password = ""
 ;
-; SigninView.php line: 129
+; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 133
+; SigninView.php line: 137
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/models/ProfileModel.php b/src/models/ProfileModel.php
index 137694a87..7a4d3d897 100755
--- a/src/models/ProfileModel.php
+++ b/src/models/ProfileModel.php
@@ -58,13 +58,14 @@ class ProfileModel extends Model
         'LOGO', 'M_LOGO', 'MAIL_PASSWORD',  'MAIL_SECURITY',
         'MAIL_SENDER', 'MAIL_SERVER', 'MAIL_SERVERPORT', 'MAIL_USERNAME',
         'MEMCACHE_SERVERS', 'MIN_RESULTS_TO_GROUP', 'NAME_SERVER', 'MEDIA_MODE',
-        'PROXY_SERVERS', 'REGISTRATION_TYPE', 'ROBOT_INSTANCE', 'RESULT_SCORE',
-        'RSS_ACCESS', 'SEARCHBAR_PATH', 'SEND_MAIL_MEDIA_UPDATER',
-        'SERVER_ALPHA', 'SESSION_NAME', 'SIDE_ADSCRIPT', 'SIDEBAR_COLOR',
-        'SIGNIN_LINK', 'SIMILAR_LINK', 'SUBSEARCH_LINK', 'TIMEZONE',
-        'TITLE_WEIGHT', 'TOPBAR_COLOR', 'TOP_ADSCRIPT','TOR_PROXY',
-        'USE_FILECACHE', 'USE_MAIL_PHP', 'USE_MEMCACHE', 'USE_PROXY',
-        'USER_AGENT_SHORT', 'WEB_URI', 'WEB_ACCESS', 'WORD_SUGGEST'
+        'PROXY_SERVERS', 'RECOVERY_MODE', 'REGISTRATION_TYPE', 'RESULT_SCORE',
+        'ROBOT_INSTANCE','RSS_ACCESS', 'SEARCHBAR_PATH',
+        'SEND_MAIL_MEDIA_UPDATER', 'SERVER_ALPHA', 'SESSION_NAME',
+        'SIDE_ADSCRIPT', 'SIDEBAR_COLOR', 'SIGNIN_LINK', 'SIMILAR_LINK',
+        'SUBSEARCH_LINK', 'TIMEZONE', 'TITLE_WEIGHT', 'TOPBAR_COLOR',
+        'TOP_ADSCRIPT','TOR_PROXY', 'USE_FILECACHE', 'USE_MAIL_PHP',
+        'USE_MEMCACHE', 'USE_PROXY', 'USER_AGENT_SHORT', 'WEB_URI',
+        'WEB_ACCESS', 'WORD_SUGGEST'
         ];
     /**
      * Profile fields which are stored in wiki or in a flat file
diff --git a/src/views/RecoverView.php b/src/views/RecoverView.php
index 5b4d867d2..db78c10d3 100644
--- a/src/views/RecoverView.php
+++ b/src/views/RecoverView.php
@@ -143,9 +143,13 @@ class RecoverView extends View
                     <?php
                     }
                     if ($activity == "recoverComplete") {
-                        $question_sets = [
-                            tl('register_view_account_recovery') =>
-                            $data['RECOVERY']];
+                        if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                            $question_sets = [
+                                tl('register_view_account_recovery') =>
+                                $data['RECOVERY']];
+                        } else {
+                            $question_sets = [];
+                        }
                     } else {
                        if (C\CAPTCHA_MODE != C\TEXT_CAPTCHA) {
                             $question_sets = [];
diff --git a/src/views/RegisterView.php b/src/views/RegisterView.php
index aeac10b15..1768bec26 100755
--- a/src/views/RegisterView.php
+++ b/src/views/RegisterView.php
@@ -274,15 +274,24 @@ class RegisterView extends View
                     <?php
                     if (isset($_SESSION["random_string"]) ||
                         isset($_SESSION["captcha_text"])) {
-                        $question_sets = [
-                            tl('register_view_account_recovery') =>
-                            $data['RECOVERY']];
+                        $question_sets = [];
+                        if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                            $question_sets = [
+                                tl('register_view_account_recovery') =>
+                                $data['RECOVERY']];
+                        }
                     } else {
-                        $question_sets = [
-                            tl('register_view_human_check') =>
-                            $data['CAPTCHA'],
-                            tl('register_view_account_recovery') =>
-                            $data['RECOVERY']];
+                        if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                            $question_sets = [
+                                tl('register_view_human_check') =>
+                                $data['CAPTCHA'],
+                                tl('register_view_account_recovery') =>
+                                $data['RECOVERY']];
+                        } else {
+                            $question_sets = [
+                                tl('register_view_human_check') =>
+                                $data['CAPTCHA']];
+                        }
                     }
                     $i = 0;
                     foreach ($question_sets as $name => $set) {
diff --git a/src/views/SigninView.php b/src/views/SigninView.php
index a870cba56..b57f08b70 100755
--- a/src/views/SigninView.php
+++ b/src/views/SigninView.php
@@ -117,12 +117,16 @@ class SigninView extends View
                 <?php
                 if (in_array(C\REGISTRATION_TYPE, ['no_activation',
                     'email_registration', 'admin_activation'])) {
+                    if (C\RECOVERY_MODE != C\NO_RECOVERY) {
                     ?>
                     <li><a href="<?=B\controllerUrl('register', true)
                         ?>a=recoverPassword<?php
                         if ($logged_in) {
                             e('&amp;'.C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN]);
                         } ?>" ><?=tl('signin_view_recover_password') ?></a></li>
+                    <?php
+                    }
+                    ?>
                     <li><a href="<?=B\controllerUrl('register', true)
                         ?>a=createAccount<?php
                         if ($logged_in) {
diff --git a/src/views/elements/SecurityElement.php b/src/views/elements/SecurityElement.php
index 9b910dcba..2461ea597 100755
--- a/src/views/elements/SecurityElement.php
+++ b/src/views/elements/SecurityElement.php
@@ -104,6 +104,26 @@ class SecurityElement extends Element
                 class="button-box" type="submit"><?=tl('security_element_save')
                 ?></button>
             </div>
+            <div class="top-margin">
+            <fieldset>
+                <legend><label
+                for="captcha-mode"><b><?php
+                e(tl('security_element_recovery_type'));
+                e("&nbsp;" . $this->view->helper("helpbutton")->render(
+                    "Recovery Type", $data[C\CSRF_TOKEN]))
+                ?></b>
+                </label></legend>
+                <?php
+                    $this->view->helper("options")->render("recovery-mode",
+                        "RECOVERY_MODE", $data['RECOVERY_MODES'],
+                        $data['RECOVERY_MODE']);
+                ?>
+            </fieldset>
+            </div>
+            <div class="top-margin center"><button
+                class="button-box" type="submit"><?=tl('security_element_save')
+                ?></button>
+            </div>
         </form>
         <h2><?=tl('security_element_captcha_recovery_questions') ?></h2>
         <?php