Add the ability to update recovery questions answers, a=chris

diff --git a/src/controllers/RegisterController.php b/src/controllers/RegisterController.php
index 8db59ba07..a19f1a782 100755
--- a/src/controllers/RegisterController.php
+++ b/src/controllers/RegisterController.php
@@ -144,28 +144,8 @@ class RegisterController extends Controller implements CrawlConstants
                 }
             }
         }
-        $num_recovery_qa = count($register_view->recovery_qa);
-        for ($i = 0; $i < $num_recovery_qa; $i++) {
-            if ($locale->isTranslated("register_view_recovery{$i}_more") &&
-                $locale->isTranslated("register_view_recovery{$i}_less") &&
-                $locale->isTranslated("register_view_recovery$i}_choices")) {
-                $this->recovery_qa[] = $register_view->recovery_qa[$i];
-            }
-         }
-        $num_so_far = count($this->recovery_qa);
-        //If current locale didn't have enough questions fill in from default
-        if ($num_so_far < self::NUM_RECOVERY_QUESTIONS) {
-            $recovery_qa = $register_view->recovery_qa;
-            foreach ($recovery_qa as $recovery_qa) {
-                if (strpos($recovery_qa[0], "register_view_recovery")===false &&
-                    strpos($recovery_qa[1], "register_view_recovery")===false&&
-                    strpos($recovery_qa[2], "register_view_recovery")===false){
-                    $this->recovery_qa[] = $recovery_qa;
-                    $num_so_far++;
-                    if ($num_so_far >= self::NUM_RECOVERY_QUESTIONS) { break; }
-                }
-            }
-        }
+        $this->recovery_qa = self::getRecoveryQuestions($register_view,
+            $locale);
         if (C\RECOVERY_MODE == C\NO_RECOVERY) {
             $this->activities = ["createAccount", "emailVerification",
                 "processAccountData", "suggestUrl"];
@@ -1028,6 +1008,37 @@ class RegisterController extends Controller implements CrawlConstants
         $data["CAPTCHA_IMAGE"] =
             $this->model("captcha")->makeGraphicalCaptcha($word);
     }
+    /**
+     *
+     */
+    public static function getRecoveryQuestions($register_view, $locale)
+    {
+        $num_recovery_qa = count($register_view->recovery_qa);
+        $out_recovery_qa = [];
+        for ($i = 0; $i < $num_recovery_qa; $i++) {
+            if ($locale->isTranslated("register_view_recovery{$i}_more") &&
+                $locale->isTranslated("register_view_recovery{$i}_less") &&
+                $locale->isTranslated("register_view_recovery$i}_choices")) {
+                $out_recovery_qa[] = $register_view->recovery_qa[$i];
+            }
+         }
+        $num_so_far = count($out_recovery_qa);
+        //If current locale didn't have enough questions fill in from default
+        if ($num_so_far < RegisterController::NUM_RECOVERY_QUESTIONS) {
+            $recovery_qa = $register_view->recovery_qa;
+            foreach ($recovery_qa as $recovery_qa) {
+                if (strpos($recovery_qa[0], "register_view_recovery")===false &&
+                    strpos($recovery_qa[1], "register_view_recovery")===false &&
+                    strpos($recovery_qa[2], "register_view_recovery")===false){
+                    $out_recovery_qa[] = $recovery_qa;
+                    $num_so_far++;
+                    if ($num_so_far >=
+                        RegisterController::NUM_RECOVERY_QUESTIONS) { break; }
+                }
+            }
+        }
+        return $out_recovery_qa;
+    }
     /**
      * Picks $num_select most/least questions from an array of triplets of
      * the form a string question: Which is the most ..?, a string
@@ -1048,7 +1059,7 @@ class RegisterController extends Controller implements CrawlConstants
      *     choice for least/most, and another array of the correct answers
      *     to the least/most problem.
      */
-    public function selectQuestionsAnswers($question_answers, $num_select,
+    public static function selectQuestionsAnswers($question_answers,$num_select,
         $num_choices = -1)
     {
         $questions = [];
diff --git a/src/controllers/components/AccountaccessComponent.php b/src/controllers/components/AccountaccessComponent.php
index 750039ab6..59651c4e5 100644
--- a/src/controllers/components/AccountaccessComponent.php
+++ b/src/controllers/components/AccountaccessComponent.php
@@ -31,6 +31,9 @@
 namespace seekquarry\yioop\controllers\components;

 use seekquarry\yioop\configs as C;
+use seekquarry\yioop\controllers\RegisterController;
+use seekquarry\yioop\models\LocaleModel;
+use seekquarry\yioop\views\RegisterView;

 /**
  * Component of the Yioop control panel used to handle activitys for
@@ -115,7 +118,47 @@ class AccountaccessComponent extends Component
                 $data['EDIT_USER'] = true;
             }
         }
-        if(isset($data['EDIT_USER']) && $data['EDIT_USER']) {
+        if(!empty($data['EDIT_USER'])) {
+            if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                $user_session = $user_model->getUserSession($user_id);
+                if (!isset($user_session['RECOVERY']) &&
+                    !isset($_SESSION['RECOVERY'])) {
+                    $data['RECOVERY'] = $this->makeRecoveryQuestions();
+                    $_SESSION['RECOVERY'] = $data['RECOVERY'];
+                } else if (isset($_SESSION['RECOVERY'])) {
+                    $data['RECOVERY'] = $_SESSION['RECOVERY'];
+                } else {
+                    $data['RECOVERY'] = $user_session['RECOVERY'];
+                }
+                if (isset($user_session["RECOVERY_ANSWERS"])) {
+                    $data["RECOVERY_ANSWERS"] =
+                        $user_session["RECOVERY_ANSWERS"];
+                }
+                $num_questions = count($data['RECOVERY']);
+                $recovery_answer_change = false;
+                if (!isset($user_session["RECOVERY_ANSWERS"])) {
+                    $data['RECOVERY_ANSWERS'] = [];
+                }
+                for ($i = 0; $i < $num_questions; $i++) {
+                    if (isset($_REQUEST["question_$i"]) &&
+                        $_REQUEST["question_$i"] != -1 &&
+                        in_array($_REQUEST["question_$i"],
+                        $data['RECOVERY'][$i]) ) {
+                        $recovery_answer_change = true;
+                        $data["RECOVERY_ANSWERS"][$i] =
+                            $_REQUEST["question_$i"];
+                        $user_session["RECOVERY_ANSWERS"][$i] =
+                            $_REQUEST["question_$i"];
+                    }
+                    if (!isset($data["RECOVERY_ANSWERS"][$i])) {
+                        $data["RECOVERY_ANSWERS"][$i] = -1;
+                    }
+                }
+                if ($recovery_answer_change) {
+                    $user_session['RECOVERY'] = $data['RECOVERY'];
+                    $user_model->setUserSession($user_id, $user_session);
+                }
+            }
             $business_id = $role_model->getRoleId('Business User');
             if(!$business_id || $business_id < 0) {
                 $data['yioop_advertisement'] = false;
@@ -256,6 +299,20 @@ class AccountaccessComponent extends Component
           }
         return $data;
     }
+
+    /**
+     *
+     */
+    public function makeRecoveryQuestions()
+    {
+        $register_view = $this->parent->view("register");
+        $locale = LocaleModel::$current_locale;
+        $recovery_qa = RegisterController::getRecoveryQuestions($register_view,
+            $locale);
+        $out_recovery_qa = RegisterController::selectQuestionsAnswers(
+            $recovery_qa, RegisterController::NUM_RECOVERY_QUESTIONS);
+        return $out_recovery_qa[0];
+    }
     /**
      * Used to handle the manage user activity.
      *
diff --git a/src/library/FileCache.php b/src/library/FileCache.php
index f619311bf..e39fa77c1 100644
--- a/src/library/FileCache.php
+++ b/src/library/FileCache.php
@@ -31,6 +31,7 @@
 namespace seekquarry\yioop\library;

 use seekquarry\yioop\configs as C;
+use seekquarry\yioop\models\datasources as D;

 /** For Yioop global defines */
 require_once __DIR__."/../configs/Config.php";
@@ -118,7 +119,7 @@ class FileCache
             $data = ['last_expired' => time(), 'count' => 0];
         }
         if ($data['count'] > self::MAX_FILES_IN_A_BIN) {
-            $db_class = ucfirst(C\DBMS) . "Manager";
+            $db_class = C\NS_DATASOURCES . ucfirst(C\DBMS) . "Manager";
             $db = new $db_class();
             $db->unlinkRecursive($checksum_dir);
         }
diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini
index 8de48f5d0..40de1db24 100755
--- a/src/locale/ar/configure.ini
+++ b/src/locale/ar/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "لا تتطابق كلمات المرور المكتوبة."
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "لا تتطابق كلمات المرور المكتوبة."
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "لا تتطابق كلمات المرور المكتوبة."
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "اسم المستخدم غير موجود"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "اسم المستخدم غير موجود"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "دور الاسم غير موجود"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "دور إضافة اسم"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "اسم المستخدم غير موجود"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "اسم المستخدم غير موجود"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "دور الاسم غير موجود"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "دور حذف اسم"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "اسم المستخدم غير موجود"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "اسم المستخدم غير موجود"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "حدد النشاط"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "دور الاسم غير موجود"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "وأضاف النشاط"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "دور الاسم موجود"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "دور إضافة اسم"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "دور الاسم غير موجود"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "حذف النشاط"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "دور الاسم غير موجود"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "دور حذف اسم"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = "استخدام configs/local_config.php
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = "التحديث التلقائي بدوره عل
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "اسم المستخدم:"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "كلمة المرور الجديدة:"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "إعادة كتابة كلمة المرور:"
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "حفظ"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini
index 07dc64134..03e7bfab4 100755
--- a/src/locale/bn/configure.ini
+++ b/src/locale/bn/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = ""
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini
index 0f20361f5..79ab81cc0 100755
--- a/src/locale/de/configure.ini
+++ b/src/locale/de/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = ""
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini
index 282dbe98a..34e14943e 100644
--- a/src/locale/en_US/configure.ini
+++ b/src/locale/en_US/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = "Descending"
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = "No Posts Yet"
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = "Password is too long!"
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "Typed passwords do not match."
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = "Invalid Password!"
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = "Unknown Image File Type!"
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = "Icon File Too Big!"
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = "User Folder Could Not be Created!"
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = "User Updated"
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = "Active"
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = "Inactive"
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = "Suspended"
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = "Pending"
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = "Invited"
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = "Active"
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = "Suspended"
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = "Password is too long!"
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "Typed passwords do not match."
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = "Invalid Username!"
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = "User Already Exists!"
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = "User Added"
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = "Can&#039;t edit -- that sername doesn&#039;t exist!"
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = "Cannot Edit Public User!"
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "Typed passwords do not match."
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = "User Updated"
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = "Filtering by Group!"
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = "Filtering by Role!"
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "Username Does Not Exist"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = "Cannot Delete Built-in User!"
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = "User Deleted"
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "Username Does Not Exist"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = "Role Name Already Added!"
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "Role Name Added"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "Username Does Not Exist"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = "Group Name does not exists"
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = "Group Name Already Added!"
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = "Group Name Added"
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "Username Does Not Exist"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "Role Name Deleted"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "Username Does Not Exist"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = "Group Name does not exists"
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = "Group Deleted"
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "Username Does Not Exist"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = "User Status Updated"
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "Select Activity"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "Activity Added"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "Role Name Exists"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "Role Name Added"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = "Role Name Blank!"
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "Activity Deleted"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "Role Name Does not Exist"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "Role Name Deleted"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = "Role updated!"
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = "Using configs/LocalConfig.php so changing
 ; MachineController.php line: 193
 machine_controller_nolines = "No Lines Match Filter!"
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = "Cookies need to be enabled to register or log in to a Yioop!"
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = "Account created successfully!!"
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = "Account registration request has been sent!"
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = "Yioop User Has Requested Activation"
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = "User %s %s with username %s has requested activation of their account."
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = "Registration email sent!"
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = "Yioop User Has Requested Activation"
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = "Dear %s %s,"
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = "This email was given in a Yioop account creation request. If you are interested in a Yioop account please use the address below to complete the registration process."
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = "Email verification error!!"
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = "Account has already been activated!"
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = "Account successfully activated!!"
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = "Email verification error!!"
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = "Recover Account Email Sent!!"
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = "Yioop Account Recovery Request"
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = "Dear %s %s,"
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = "A request was made to recover your Yioop password. If this is correct, please paste the link below into a browser and complete the form presented."
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = "Recover email already used!"
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = "Recover email has expired!"
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = "Password changed!"
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = "Passwords don&#039;t match!"
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = "Recover email already used!"
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = "Recover email has expired!"
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = "Resend Registration Fail!"
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = "Resend Registration Fail!"
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = "User Account Already Active!"
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = "Format of URL is invalid!"
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = "Starred fields need to be filled in correctly!"
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = "Hash Code Did Not Match!"
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = "Got human check questions wrong!"
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = "Captcha Mis-entered!"
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = "Suggest URL buffer is full! Please try again later!"
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = "Suggested URL saved!"
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = "Cookies need to be enabled to register or log in to a Yioop!"
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = "Got human check questions wrong!"
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = "Captcha Mis-entered!"
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = "Hash Code Did Not Match!"
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = "Starred fields need to be filled in correctly!"
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = "Check Email Address!"
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = "Account not created - Username already in use!!"
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = "Turn Auto Refresh On"
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = "Toggle whether account information is editable"
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = "Welcome, %s!"
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = "From this page you can access and control aspects of your account."
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = "Account Details"
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = "User Icon"
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "Username"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = "First Name"
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = "Last Name"
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = "Email"
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = "Advertise With Us"
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = "Password:"
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "New Password: "
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "Retype: "
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = "Recovery Answers:"
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "Save"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = "Language and Search Settings"
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = "Crawls and Indexes"
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = "Crawl and index the web or an existing archive and create a searchable index."
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = "You have %s active crawls, %s previous crawl indexes."
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = "Manage Crawls and Indexes"
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = "Groups and Feeds"
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = "Create or subscribe to groups to communicate with friends."
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = "You belong to %s groups."
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = "You belong to 1 group."
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = "wiki"
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = "%s posts, %s threads"
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = "Last Post:"
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = "Join/Manage All Groups"
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = "See Combined Group Feeds"
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = "Crawl Mixes"
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = "Present search results from multiple indexes in the order you prefer. Share your search creations with groups of friends."
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = "You have %s crawl mixes."
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = "You have %s crawl mix."
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = "Create/Manage Crawl Mixes"
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini
index 0f00628cb..662310fe7 100755
--- a/src/locale/es/configure.ini
+++ b/src/locale/es/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "Las contrase&ntilde;as introducidas no coinciden."
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "Las contrase&ntilde;as introducidas no coinciden."
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "Las contrase&ntilde;as introducidas no coinciden."
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "El nombre de usuario no existe"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "El nombre de usuario no existe"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "El nombre de usuario no existe"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "El nombre de usuario no existe"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "El nombre de usuario no existe"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "El nombre de usuario no existe"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "Actividad eliminada"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini
index 8d0822a0d..a51030f6a 100755
--- a/src/locale/fa/configure.ini
+++ b/src/locale/fa/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "رمزعبورهای وارد شده مطابقت ندارند."
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "رمزعبورهای وارد شده مطابقت ندارند."
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "رمزعبورهای وارد شده مطابقت ندارند."
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "این نام کاربری وجود ندارد"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "این نام کاربری وجود ندارد"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "این نقش وجود ندارد"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "نقش اضافه شد"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "این نام کاربری وجود ندارد"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "این نام کاربری وجود ندارد"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "این نقش وجود ندارد"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "نقش حذف شد"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "این نام کاربری وجود ندارد"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "این نام کاربری وجود ندارد"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "یک فعالیت انتخاب کنید"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "این نقش وجود ندارد"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "فعالیت اضافه شد"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "این نقش وجود دارد"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "نقش اضافه شد"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "این نقش وجود ندارد"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "فعالیت حذف شد"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "این نقش وجود ندارد"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "نقش حذف شد"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = "از configs/local_config.php استفا
 ; MachineController.php line: 193
 machine_controller_nolines = "هیچ خطی با این فیلتر مطابق نیست!"
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = "بازآوری خودکار روشن باشد"
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "نام کاربر:"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "رمز عبور جدید:"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "تکرار رمز عبور جدید:"
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "ذخیره"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini
index a6e1079a0..6ec6d5504 100755
--- a/src/locale/fr_FR/configure.ini
+++ b/src/locale/fr_FR/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = ""
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = "Sur"
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "Nouveau Mot de passe:"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "Veuillez resaisir votre mot de passe:     "
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini
index 58ffcb9ac..1a1bc7d04 100755
--- a/src/locale/he/configure.ini
+++ b/src/locale/he/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "סיסמא  אינה נכונה"
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "סיסמא  אינה נכונה"
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "סיסמא  אינה נכונה"
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "שם שמשתמש אינו קיים"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "שם שמשתמש אינו קיים"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "שם תפקיד אינו קיים"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "שם תפקיד נוצר"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "שם שמשתמש אינו קיים"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "שם שמשתמש אינו קיים"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "שם תפקיד אינו קיים"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "שם תפקיד נמחק"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "שם שמשתמש אינו קיים"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "שם שמשתמש אינו קיים"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "בחר פעילות"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "שם תפקיד אינו קיים"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "שם תפקיד קיים במערכת"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "שם תפקיד נוצר"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "שם תפקיד אינו קיים"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "פעילות נמחקה"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "שם תפקיד אינו קיים"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "שם תפקיד נמחק"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ":סיסמא חדשה"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "שמור"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini
index 17760f94f..29106518d 100755
--- a/src/locale/hi/configure.ini
+++ b/src/locale/hi/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "पासवर्ड एक समान नहीं"
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "पासवर्ड एक समान नहीं"
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "पासवर्ड एक समान नहीं"
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = ""
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/in_ID/configure.ini b/src/locale/in_ID/configure.ini
index a306df371..dd818104e 100755
--- a/src/locale/in_ID/configure.ini
+++ b/src/locale/in_ID/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "Kata sandi tidak sesuai"
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "Kata sandi tidak sesuai"
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "Kata sandi tidak sesuai"
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "Username tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "Username tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "Rolename tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "Rolename telah ditambah"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "Username tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "Username tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "Rolename tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "Rolename telah dihapus"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "Username tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "Username tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "Pilih name aktivitas"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "Rolename tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "Aktivitas telah ditambah"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "Rolename ditemukan"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "Rolename telah ditambah"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "Rolename tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "Aktivitas telah dihapus"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "Rolename tidak ditemukan"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "Rolename telah dihapus"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "username"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini
index c81a5aa3a..dbc386517 100755
--- a/src/locale/it/configure.ini
+++ b/src/locale/it/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "Password inserita errata."
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "Password inserita errata."
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "Password inserita errata."
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "L&#039;Utente non esiste"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "L&#039;Utente non esiste"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "Nome Ruolo inesistente"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "Nome Ruolo aggiunto"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "L&#039;Utente non esiste"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "L&#039;Utente non esiste"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "Nome Ruolo inesistente"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "Nome Ruolo cancellato"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "L&#039;Utente non esiste"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "L&#039;Utente non esiste"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "Seleziona Attivit&agrave;"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "Nome Ruolo inesistente"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "Attivit&agrave; aggiunta"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "Nome Ruolo esistente"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "Nome Ruolo aggiunto"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "Nome Ruolo inesistente"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "Attivit&agrave; cancellata"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "Nome Ruolo inesistente"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "Nome Ruolo cancellato"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = "Usando configs/local_config.php la Cartel
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = "Abilita auto-aggiornamento"
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "Utente: "
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "Nuova Password: "
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "Riscrivi Password: "
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "Salva"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini
index c94fa2e63..52ccf8664 100755
--- a/src/locale/ja/configure.ini
+++ b/src/locale/ja/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "パスワードを違います"
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "パスワードを違います"
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "パスワードを違います"
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "ユーザー名は存在しません"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "ユーザー名は存在しません"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "役割は存在しません"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "役割が追加しました"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "ユーザー名は存在しません"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "ユーザー名は存在しません"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "役割は存在しません"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "役割を削除しました"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "ユーザー名は存在しません"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "ユーザー名は存在しません"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "選択アクティビティ名"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "役割は存在しません"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "アクティビティが追加しました"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "役割が存在します"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "役割が追加しました"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "役割は存在しません"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "アクティビティを削除しました"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "役割は存在しません"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "役割を削除しました"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "ユーザー名"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "新しいパスワード"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "歳入力パスワード"
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "保存"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini
index 93633b00e..b80bed5d3 100755
--- a/src/locale/kn/configure.ini
+++ b/src/locale/kn/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "ಬರೆದ ಪ್ರವೇಶ ಪದಗಳು ಹೋಲಲಿಲ್ಲ "
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "ಬರೆದ ಪ್ರವೇಶ ಪದಗಳು ಹೋಲಲಿಲ್ಲ "
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "ಬರೆದ ಪ್ರವೇಶ ಪದಗಳು ಹೋಲಲಿಲ್ಲ "
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "ಈ ಪಾತ್ರದ ಹೆಸರನ್ನು ಸೇರಿಸಲಾಗಿದೆ"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "ಈ ಪಾತ್ರದ ಹೆಸರನ್ನು ಅಳಿಸಲಾಗಿದೆ"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "ಈ ಬಳಕೆದಾರನ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "ಚಟುವಟಿಕೆ ಆಯ್ಕೆ ಮಾಡಿ"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "ಈ ಚಟುವಟಿಕೆಯನ್ನು ಸೇರಿಸಲಾಗಿದೆ"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇದೆ"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "ಈ ಪಾತ್ರದ ಹೆಸರನ್ನು ಸೇರಿಸಲಾಗಿದೆ"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "ಈ ಚಟುವಟಿಕೆಯನ್ನು ಅಳಿಸಲಾಗಿದೆ"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "ಈ ಪಾತ್ರದ ಹೆಸರು ಅಸ್ತಿತ್ವದಲ್ಲಿ ಇಲ್ಲ"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "ಈ ಪಾತ್ರದ ಹೆಸರನ್ನು ಅಳಿಸಲಾಗಿದೆ"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = "configs/local_config.php ಉಪಯೋಗ
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini
index 33bc7be7e..de50408c0 100755
--- a/src/locale/ko/configure.ini
+++ b/src/locale/ko/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "비밀 번호가 일치하지 않습니다."
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "비밀 번호가 일치하지 않습니다."
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "비밀 번호가 일치하지 않습니다."
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "아이디가 존재 하지 않습니다."
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "아이디가 존재 하지 않습니다."
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다."
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "사용자 권한 이름을 추가하였습니다."
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "아이디가 존재 하지 않습니다."
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "아이디가 존재 하지 않습니다."
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다."
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "사용자 권한이름을 삭제하였습니다."
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "아이디가 존재 하지 않습니다."
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "아이디가 존재 하지 않습니다."
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "엑티비티 이름을 선택해 주십시요."
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다."
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "엑티비티를 추가했습니다."
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "동일 권한 이름이 존재 합니다."
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "사용자 권한 이름을 추가하였습니다."
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다."
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "엑티비티를 삭제 했습니다."
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "사용자 권한 이름이 존재하지 않습니다."
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "사용자 권한이름을 삭제하였습니다."
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "사용자:"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "새 비밀번호:"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "다시 비밀번호를 적어주십시요:"
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "저장"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini
index 5b2977192..c84c44706 100644
--- a/src/locale/nl/configure.ini
+++ b/src/locale/nl/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = "aflopend"
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = "Geen berichten Toch"
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = "Wachtwoord is te lang!"
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "Getypte wachtwoorden komen niet overeen."
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = "Ongeldig Wachtwoord!"
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = "Onbekend Image File Type!"
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = "Pictogram Bestand te groot!"
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = "Gebruiker map kon niet worden aangemaakt!"
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = "gebruiker Bijgewerkt"
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = "actief"
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = "inactief"
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = "in afwachting van"
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = "uitgenodigd"
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = "actief"
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = "Wachtwoord is te lang!"
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "Getypte wachtwoorden komen niet overeen."
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = "Ongeldige gebruikersnaam!"
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = "Gebruiker Bestaat Al!"
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = "gebruiker Toegevoegd"
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = "Kan niet bewerken - dat sername bestaat niet!"
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = "Kan Public User niet bewerken!"
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "Getypte wachtwoorden komen niet overeen."
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = "gebruiker Bijgewerkt"
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = "Filtering door Group!"
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = "Filtering door Rol!"
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "Gebruikersnaam is niet bekend"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = "Kan niet verwijderen Ingebouwde gebruiker!"
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = "gebruiker Verwijderde"
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "Gebruikersnaam is niet bekend"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "Rol bestaat niet"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = "Rolnaam Reeds Toegevoegd!"
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "Rolnaam Toegevoegd"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "Gebruikersnaam is niet bekend"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = "Groep Naam bestaat niet"
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = "Groep Naam Reeds Toegevoegd!"
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = "Groep Naam Toegevoegd"
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "Gebruikersnaam is niet bekend"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "Rol bestaat niet"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "Rolnaam Verwijderde"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "Gebruikersnaam is niet bekend"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = "Groep Naam bestaat niet"
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = "groep Deleted"
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "Gebruikersnaam is niet bekend"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = "Gebruiker Status Bijgewerkt"
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "Kies een activiteit"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "Rol bestaat niet"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "activiteit Toegevoegd"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "Rol naam bestaat"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "Rolnaam Toegevoegd"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = "Rol Naam Blanco!"
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "Rol bestaat niet"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "activiteit Verwijderde"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "Rol bestaat niet"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "Rolnaam Verwijderde"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = "Rol op de hoogte!"
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = "Met behulp van configs / local_config.php
 ; MachineController.php line: 193
 machine_controller_nolines = "Geen Lijnen Match Filter!"
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = "Cookies moeten worden ingeschakeld om te registreren of log in om een Yioop!"
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = "Houdend met succes aangemaakt!!"
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = "Account registratie aanvraag is verzonden!"
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = "Yioop gebruiker heeft Gevraagde Activering"
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = "Gebruiker %s %s met gebruikersnaam %s heeft verzocht de activering van hun rekening."
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = "Registratie e-mail gestuurd!"
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = "Yioop gebruiker heeft Gevraagde Activering"
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = "Geachte %s %s,"
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = "Deze e-mail werd gegeven in een rekeningsverwezenlijking verzoek Yioop. Als u ge&iuml;nteresseerd bent in een Yioop rekening zijn wij u hieronder het adres gebruiken het registratieproces te voltooien."
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = "E-mail verificatie fout!!"
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = "Account is al geactiveerd!"
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = "Account succesvol geactiveerd!!"
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = "E-mail verificatie fout!!"
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = "Recover account E Verzonden!!"
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = "Yioop Account Recovery Request"
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = "Geachte %s %s,"
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = "Een verzoek werd gedaan om uw Yioop wachtwoord te achterhalen. Als dit juist is, dan kunt u plak de onderstaande link in een browser en vul het formulier gepresenteerd."
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = "Recover e-mail al gebruikt!"
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = "Recover e-mail is verlopen!"
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = "Wachtwoord veranderd!"
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = "Wachtwoorden komen niet overeen!"
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = "Recover e-mail al gebruikt!"
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = "Recover e-mail is verlopen!"
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = "Formaat van URL is ongeldig!"
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = "Starred velden moeten correct worden ingevuld!"
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = "Hash-code niet overeen!"
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = "Kreeg de menselijke controle vragen verkeerd!"
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = "Captcha Mis-aangegaan!"
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = "Suggereren URL buffer vol is! Probeer het later opnieuw!"
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = "Gesuggereerd URL gered!"
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = "Cookies moeten worden ingeschakeld om te registreren of log in om een Yioop!"
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = "Kreeg de menselijke controle vragen verkeerd!"
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = "Captcha Mis-aangegaan!"
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = "Hash-code niet overeen!"
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = "Starred velden moeten correct worden ingevuld!"
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = "Controleer e-mailadres!"
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = "Geen account aangemaakt - Gebruikersnaam al in gebruik!!"
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = "Schakel automatisch vernieuwen On"
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = "Knevel of de rekeningsinformatie editable is"
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = "Welkom, %s!"
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = "Vanaf deze pagina kunt u toegang tot en controle aspecten van uw account."
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = "account Details"
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = "user Icon"
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "gebruikersnaam"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = "Voornaam"
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = "achternaam"
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = "e-mail"
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = "wachtwoord:"
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "Nieuw Wachtwoord:"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "overtypen:"
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "Opslaan"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = "Taal en zoeken Instellingen"
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = "Kruipt en indexen"
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = "Crawlen en indexeren van de webpagina of een bestaand archief en het cre&iuml;ren van een doorzoekbare index."
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = "Je hebt %s actief kruipt, %s vorige kruipen indexen."
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = "Beheer Crawls en indexen"
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = "Groepen en Feeds"
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = "Maken of zich abonneren op groepen om te communiceren met vrienden."
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = "U behoort tot %s groepen."
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = "U behoort tot 1 groep."
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = "wiki"
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = " %s berichten, %s discussies"
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = "Laatste bericht:"
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = "Join / beheren Alle groepen"
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = "Zie Gecombineerde Groep Feeds"
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = "crawl Mixes"
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = "Aanwezig zoekresultaten van meerdere indexen in de volgorde van uw voorkeur. Deel uw zoekopdracht creaties met een groep vrienden."
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = "Je hebt %s kruipen mixen."
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = "Je hebt %s kruipen mix."
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = "Maak / beheren Crawl Mixes"
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini
index 5957ee889..ea59e0512 100755
--- a/src/locale/pl/configure.ini
+++ b/src/locale/pl/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = ""
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini
index d8589162b..df43685b8 100755
--- a/src/locale/pt/configure.ini
+++ b/src/locale/pt/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = ""
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini
index 355c8b1a2..6ff56b61c 100755
--- a/src/locale/ru/configure.ini
+++ b/src/locale/ru/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = ""
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini
index 345ed9fed..85f0409aa 100644
--- a/src/locale/te/configure.ini
+++ b/src/locale/te/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = "అవరోహణ క్రమం"
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = "ఇంకా పోస్ట్లు ఏవీ లేవు"
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = "పాస్&zwnj;వర్డ్ చాలా పొడవుగా ఉంది!"
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "పాస్&zwnj;వర్డ్ ఒకలాగ లేవు"
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = "చెల్లని పాస్&zwnj;వర్డ్!"
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = "తెలియని ఇమేజ్ ఫైలు రకం!"
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = "ఐకాన్ ఫైల్ చాలా పెద్దగా వుంది!"
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = "యూజర్ ఫోల్డర్ సృష్టించుట కుదరదు!"
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = "యూజర్ అప్డేట్ అయినది"
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = "ఆక్టివ్"
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = "ఆక్టివ్ లో లేదు "
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = "పెండింగ్"
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = "ఆహ్వానించబడినది"
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = "ఆక్టివ్"
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = "పాస్&zwnj;వర్డ్ చాలా పొడవుగా ఉంది!"
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "పాస్&zwnj;వర్డ్ ఒకలాగ లేవు"
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = "చెల్లని యూజర్ పేరు!"
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = "యూజర్ ఇప్పటికే ఉంది!"
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = "యూజర్ ఆడ్ చేయబడింది"
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = "పబ్లిక్ యూజర్ ఎడిట్ చేయలేరు!"
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "పాస్&zwnj;వర్డ్ ఒకలాగ లేవు"
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = "యూజర్ అప్డేట్ అయినది"
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = "గ్రూప్ పేరు తో ఫిల్టర్ చేయబడినది!"
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = "రోల్ పేరు తో ఫిల్టర్ చేయబడినది!  "
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "యూజర్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = "బిల్ట్-ఇన్ యూజర్ ని డిలీట్ చేయలేరు! "
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = "యూజర్ తీసి వేయబడినది "
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "యూజర్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "రోల్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = "రోల్ పేరు ఇంతకు ముందే ఆడ్ చేయబడినది!"
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "రోల్ పేరు క్రియేట్ చేయబడింది"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "యూజర్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = "ఈ గ్రూప్ పేరు లేదు "
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = "గ్రూప్ పేరు ఇది వరకే జోడించబడింది"
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = "గ్రూప్ పేరు జోడించబడింది "
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "యూజర్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "రోల్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "రోల్ పేరు డిలీట్ చేయబడింది"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "యూజర్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = "ఈ గ్రూప్ పేరు లేదు "
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = "గ్రూప్ తీసి వేయబడినది"
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "యూజర్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = "యూజర్ స్టేటస్ అప్డేట్ అయినది"
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "యాక్టివిటి  ఎంచుకోండి"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "రోల్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "యాక్టివిటి జోడించారు"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "రోల్ పేరు ఇదివరకే ఉన్నది"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "రోల్ పేరు క్రియేట్ చేయబడింది"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = "రోల్ పేరు ఖాళీగా వున్నది!"
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "రోల్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "యాక్టివిటి డిలీట్ చేయబడింది"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "రోల్ పేరు లేదు"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "రోల్ పేరు డిలీట్ చేయబడింది"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = "రోల్ అప్డేట్ చేయబడింది!"
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = "ఖాతావిజయవంతంగా సృష్టించబడినది!!"
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = "ఖాతా నమోదు అభ్యర్థన పంపబడింది!"
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = "Yioop యూజర్ ఆక్టివేట్ చేయమని అభ్యర్థించారు"
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = "యూజర్ %s %s పేరు తో %s వారి ఖాతా ఆక్టివేషన్ అభ్యర్థించారు."
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = "నమోదు ఇమెయిల్ పంపిచబడినది!"
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = "Yioop యూజర్ ఆక్టివేట్ చేయమని అభ్యర్థించారు"
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = "ప్రియమైన %s %s,"
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = "ఈ ఇమెయిల్ ఖాతా నమోదు అభ్యర్థనలో ఇవ్వబడింది. మీకు Yioop ఖాతాఫై ఆసక్తి ఉంటే, దయచేసి నమోదు ప్రక్రియ పూర్తి చేయడానికి ఈ క్రింది చిరునామాను ఉపయోగించండి."
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = "ఇమెయిల్ ధృవీకరణ లోపం!!"
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = "ఖాతా ఇదివరకే యాక్టివేట్ చేయబడింది!"
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = "ఖాతా విజయవంతంగా యాక్టివేట్ చేయబడింది"
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = "ఇమెయిల్ ధృవీకరణ లోపం!!"
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = "ఖాతా పునరుద్ధరన ఇమెయిల్ పంపిచబడినది!!"
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = "Yioop ఖాతా పునరుద్ధరన అభ్యర్థన"
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = "ప్రియమైన %s %s,"
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = "పునరుద్ధరన ఇమెయిల్ ఇదివరకే వాడబడినది!"
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = "పునరుద్ధరన ఇమెయిల్ గడువు ముగిసింది!"
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = "పాస్ వర్డ్ మార్చబడినది!"
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = "పాస్ వర్డ్స్ సరిపోలడం లేదు!"
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = "పునరుద్ధరన ఇమెయిల్ ఇదివరకే వాడబడినది!"
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = "పునరుద్ధరన ఇమెయిల్ గడువు ముగిసింది!"
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = "యుఆర్ఎల్ యొక్క ఫార్మాట్ చెల్లదు!"
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = "స్టార్ ఉన్న ఫీల్డ్స్ తప్పని సరిగా పూర్తి చేయాలి!"
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = "హాష్ కోడ్ సరిపోలడం లేదు!"
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = "మానవ చెక్ ప్రశ్నలు తప్పు వచ్చాయి!"
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = "కాప్చ సరికాదు!"
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = "సూచించిన యుఆర్ఎల్ బఫర్ నిండి పోయినది. దయచేసి కాసేపు ఆగి మరలా ప్రయత్నించండి!"
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = "సూచించిన యుఆర్ఎల్ సేవ్ చేయబడినది!"
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = "మానవ చెక్ ప్రశ్నలు తప్పు వచ్చాయి!"
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = "కాప్చ సరికాదు!"
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = "హాష్ కోడ్ సరిపోలడం లేదు!"
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = "స్టార్ ఉన్న ఫీల్డ్స్ తప్పని సరిగా పూర్తి చేయాలి!"
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = "ఇ-మెయిల్ చిరునామా మరోసారి పరిశీలించండి! "
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = "ఖాతా సృస్టించలేదు - యూజర్ పేరు వాడుకలో వున్నది!!"
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = "ఆటో రిఫ్రెష్ ఆన్
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = "స్వాగతం, %s!"
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = "ఈ పేజీ నుండి మీరు మీ ఖాతా అంశాలను ఆక్సెస్ మరియు నియంత్రణ చేయవచ్చు."
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = "ఖాతా వివరాలు"
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = "యూజర్ ఐకాన్"
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "యూజర్ పేరు"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = "పేరు"
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = "ఇంటి పేరు"
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = "ఇ-మెయిలు "
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = "పాస్&zwnj;వర్డ్:"
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "కొత్త పాస్&zwnj;వర్డ్:"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "మరలా టైపు చెయ్యండి:"
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "సేవ్"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = "భాష మరియు శోధన సెట్టింగులు"
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = "క్రాల్స్ మరియు సూచికలు"
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = "క్రాల్స్ మరియు సూచికల నిర్వహణ"
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = "వికీ"
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = "%sపోస్ట్లు, %sథ్రెడ్లు"
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = "ఆఖరి పోస్ట్:"
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = "క్రాల్ మిక్షెస్"
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini
index 450214e20..0aeaaa865 100755
--- a/src/locale/th/configure.ini
+++ b/src/locale/th/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = ""
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini
index 5f0a57891..1bdcb8bbc 100755
--- a/src/locale/tr/configure.ini
+++ b/src/locale/tr/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = ""
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = ""
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = ""
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = ""
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = ""
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = ""
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = ""
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = ""
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = ""
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = ""
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini
index 3f0b50a0f..b6f613fb0 100755
--- a/src/locale/vi_VN/configure.ini
+++ b/src/locale/vi_VN/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "Những mật khẩu đ&atilde; nhập kh&ocirc;ng tr&ugrave;ng nhau"
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "Những mật khẩu đ&atilde; nhập kh&ocirc;ng tr&ugrave;ng nhau"
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "Những mật khẩu đ&atilde; nhập kh&ocirc;ng tr&ugrave;ng nhau"
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "T&ecirc;n sử dụng kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "T&ecirc;n sử dụng kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "Chức vụ kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "Cộng th&ecirc;m chức vụ "
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "T&ecirc;n sử dụng kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "T&ecirc;n sử dụng kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "Chức vụ kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "X&oacute;a chức vụ"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "T&ecirc;n sử dụng kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "T&ecirc;n sử dụng kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "Lựa chọn họat động"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "Chức vụ kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "Bổ sung t&ecirc;n hoạt động "
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "Chức vụ đ&atilde; đựơc d&ugrave;ng"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "Cộng th&ecirc;m chức vụ "
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "Chức vụ kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "X&oacute;a t&ecirc;n hoạt động"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "Chức vụ kh&ocirc;ng tồn tại"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "X&oacute;a chức vụ"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = ""
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "T&ecirc;n sử dụng:"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "Mật khẩu mới:"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "Đ&aacute;nh lại mật khẩu:"
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = "Lưu"
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini
index 327231820..7f2978a35 100755
--- a/src/locale/zh_CN/configure.ini
+++ b/src/locale/zh_CN/configure.ini
@@ -96,172 +96,172 @@ admin_controller_sort_descending = ""
 ;
 ; /Applications/MAMP/htdocs/git/yioop/src/controllers/components
 ;
-; AccountaccessComponent.php line: 155
+; AccountaccessComponent.php line: 194
 accountaccess_component_no_posts_yet = ""
 ;
-; AccountaccessComponent.php line: 171
+; AccountaccessComponent.php line: 210
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 181
+; AccountaccessComponent.php line: 220
 accountaccess_component_passwords_dont_match = "密碼錯誤"
 ;
-; AccountaccessComponent.php line: 188
+; AccountaccessComponent.php line: 227
 accountaccess_component_invalid_password = ""
 ;
-; AccountaccessComponent.php line: 230
+; AccountaccessComponent.php line: 269
 accountaccess_component_unknown_imagetype = ""
 ;
-; AccountaccessComponent.php line: 235
+; AccountaccessComponent.php line: 274
 accountaccess_component_icon_too_big = ""
 ;
-; AccountaccessComponent.php line: 244
+; AccountaccessComponent.php line: 283
 accountaccess_component_no_user_folder = ""
 ;
-; AccountaccessComponent.php line: 253
+; AccountaccessComponent.php line: 292
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 294
+; AccountaccessComponent.php line: 347
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 295
+; AccountaccessComponent.php line: 348
 accountaccess_component_inactive_status = ""
 ;
-; AccountaccessComponent.php line: 297
+; AccountaccessComponent.php line: 350
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 300
+; AccountaccessComponent.php line: 353
 accountaccess_component_request_join = ""
 ;
-; AccountaccessComponent.php line: 301
+; AccountaccessComponent.php line: 354
 accountaccess_component_invited = ""
 ;
-; AccountaccessComponent.php line: 302
+; AccountaccessComponent.php line: 355
 accountaccess_component_active_status = ""
 ;
-; AccountaccessComponent.php line: 304
+; AccountaccessComponent.php line: 357
 accountaccess_component_suspended_status = ""
 ;
-; AccountaccessComponent.php line: 352
+; AccountaccessComponent.php line: 405
 accountaccess_component_passwords_too_long = ""
 ;
-; AccountaccessComponent.php line: 357
+; AccountaccessComponent.php line: 410
 accountaccess_component_passwords_dont_match = "密碼錯誤"
 ;
-; AccountaccessComponent.php line: 361
+; AccountaccessComponent.php line: 414
 accountaccess_component_invalid_username = ""
 ;
-; AccountaccessComponent.php line: 365
+; AccountaccessComponent.php line: 418
 accountaccess_component_user_exists = ""
 ;
-; AccountaccessComponent.php line: 394
+; AccountaccessComponent.php line: 447
 accountaccess_component_user_added = ""
 ;
-; AccountaccessComponent.php line: 403
+; AccountaccessComponent.php line: 456
 accountaccess_component_user_doesnt_exist = ""
 ;
-; AccountaccessComponent.php line: 410
+; AccountaccessComponent.php line: 463
 accountaccess_component_cant_edit_public_user = ""
 ;
-; AccountaccessComponent.php line: 452
+; AccountaccessComponent.php line: 505
 accountaccess_component_passwords_dont_match = "密碼錯誤"
 ;
-; AccountaccessComponent.php line: 458
+; AccountaccessComponent.php line: 511
 accountaccess_component_user_updated = ""
 ;
-; AccountaccessComponent.php line: 464
+; AccountaccessComponent.php line: 517
 accountaccess_component_user_filter_group = ""
 ;
-; AccountaccessComponent.php line: 468
+; AccountaccessComponent.php line: 521
 accountaccess_component_user_filter_role = ""
 ;
-; AccountaccessComponent.php line: 479
+; AccountaccessComponent.php line: 532
 accountaccess_component_username_doesnt_exists = "此使用者不存在"
 ;
-; AccountaccessComponent.php line: 484
+; AccountaccessComponent.php line: 537
 accountaccess_component_cant_delete_builtin = ""
 ;
-; AccountaccessComponent.php line: 489
+; AccountaccessComponent.php line: 542
 accountaccess_component_user_deleted = ""
 ;
-; AccountaccessComponent.php line: 498
+; AccountaccessComponent.php line: 551
 accountaccess_component_username_doesnt_exists = "此使用者不存在"
 ;
-; AccountaccessComponent.php line: 503
+; AccountaccessComponent.php line: 556
 accountaccess_component_rolename_doesnt_exists = "無此暱稱"
 ;
-; AccountaccessComponent.php line: 509
+; AccountaccessComponent.php line: 562
 accountaccess_component_rolename_already_added = ""
 ;
-; AccountaccessComponent.php line: 515
+; AccountaccessComponent.php line: 568
 accountaccess_component_rolename_added = "增加暱稱"
 ;
-; AccountaccessComponent.php line: 525
+; AccountaccessComponent.php line: 578
 accountaccess_component_username_doesnt_exists = "此使用者不存在"
 ;
-; AccountaccessComponent.php line: 530
+; AccountaccessComponent.php line: 583
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 536
+; AccountaccessComponent.php line: 589
 accountaccess_component_groupname_already_added = ""
 ;
-; AccountaccessComponent.php line: 544
+; AccountaccessComponent.php line: 597
 accountaccess_component_groupname_added = ""
 ;
-; AccountaccessComponent.php line: 554
+; AccountaccessComponent.php line: 607
 accountaccess_component_username_doesnt_exists = "此使用者不存在"
 ;
-; AccountaccessComponent.php line: 559
+; AccountaccessComponent.php line: 612
 accountaccess_component_rolename_doesnt_exists = "無此暱稱"
 ;
-; AccountaccessComponent.php line: 568
+; AccountaccessComponent.php line: 621
 accountaccess_component_rolename_deleted = "刪除暱稱"
 ;
-; AccountaccessComponent.php line: 578
+; AccountaccessComponent.php line: 631
 accountaccess_component_username_doesnt_exists = "此使用者不存在"
 ;
-; AccountaccessComponent.php line: 583
+; AccountaccessComponent.php line: 636
 accountaccess_component_groupname_doesnt_exists = ""
 ;
-; AccountaccessComponent.php line: 592
+; AccountaccessComponent.php line: 645
 accountaccess_component_group_deleted = ""
 ;
-; AccountaccessComponent.php line: 609
+; AccountaccessComponent.php line: 662
 accountaccess_component_username_doesnt_exists = "此使用者不存在"
 ;
-; AccountaccessComponent.php line: 615
+; AccountaccessComponent.php line: 668
 accountaccess_component_userstatus_updated = ""
 ;
-; AccountaccessComponent.php line: 778
+; AccountaccessComponent.php line: 831
 accountaccess_component_select_activityname = "選擇活動名稱"
 ;
-; AccountaccessComponent.php line: 803
+; AccountaccessComponent.php line: 856
 accountaccess_component_rolename_doesnt_exists = "無此暱稱"
 ;
-; AccountaccessComponent.php line: 819
+; AccountaccessComponent.php line: 872
 accountaccess_component_activity_added = "活動名稱已加入"
 ;
-; AccountaccessComponent.php line: 828
+; AccountaccessComponent.php line: 881
 accountaccess_component_rolename_exists = "此暱稱已存在"
 ;
-; AccountaccessComponent.php line: 834
+; AccountaccessComponent.php line: 887
 accountaccess_component_rolename_added = "增加暱稱"
 ;
-; AccountaccessComponent.php line: 838
+; AccountaccessComponent.php line: 891
 accountaccess_component_rolename_blank = ""
 ;
-; AccountaccessComponent.php line: 847
+; AccountaccessComponent.php line: 900
 accountaccess_component_rolename_doesnt_exists = "無此暱稱"
 ;
-; AccountaccessComponent.php line: 865
+; AccountaccessComponent.php line: 918
 accountaccess_component_activity_deleted = "活動已刪除"
 ;
-; AccountaccessComponent.php line: 873
+; AccountaccessComponent.php line: 926
 accountaccess_component_rolename_doesnt_exists = "無此暱稱"
 ;
-; AccountaccessComponent.php line: 878
+; AccountaccessComponent.php line: 931
 accountaccess_component_rolename_deleted = "刪除暱稱"
 ;
-; AccountaccessComponent.php line: 910
+; AccountaccessComponent.php line: 963
 accountaccess_component_role_updated = ""
 ;
 ; AdvertisementComponent.php line: 60
@@ -1428,139 +1428,139 @@ system_component_using_local_config = "使用當地語言"
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 263
+; RegisterController.php line: 243
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 329
+; RegisterController.php line: 309
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 378
+; RegisterController.php line: 358
 register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 382
+; RegisterController.php line: 362
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 383
+; RegisterController.php line: 363
 register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 411
+; RegisterController.php line: 391
 register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 413
+; RegisterController.php line: 393
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 414
+; RegisterController.php line: 394
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 416
+; RegisterController.php line: 396
 register_controller_email_body = ""
 ;
-; RegisterController.php line: 452
+; RegisterController.php line: 432
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 458
+; RegisterController.php line: 438
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 465
+; RegisterController.php line: 445
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 468
+; RegisterController.php line: 448
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 516
+; RegisterController.php line: 496
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 527
+; RegisterController.php line: 507
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 531
+; RegisterController.php line: 511
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 535
+; RegisterController.php line: 515
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 536
+; RegisterController.php line: 516
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 518
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 573
+; RegisterController.php line: 553
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 585
+; RegisterController.php line: 565
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 599
+; RegisterController.php line: 579
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 606
+; RegisterController.php line: 586
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 610
+; RegisterController.php line: 590
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 616
+; RegisterController.php line: 596
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 624
+; RegisterController.php line: 604
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 638
+; RegisterController.php line: 618
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 642
+; RegisterController.php line: 622
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 696
+; RegisterController.php line: 676
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 708
+; RegisterController.php line: 688
 register_controller_email_resend_fail = ""
 ;
-; RegisterController.php line: 712
+; RegisterController.php line: 692
 register_controller_user_active_fail = ""
 ;
-; RegisterController.php line: 830
+; RegisterController.php line: 810
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 834
+; RegisterController.php line: 814
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 847
+; RegisterController.php line: 827
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 857
+; RegisterController.php line: 837
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 884
+; RegisterController.php line: 864
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 919
+; RegisterController.php line: 899
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 923
+; RegisterController.php line: 903
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1125
+; RegisterController.php line: 1136
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1131
+; RegisterController.php line: 1142
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1146
+; RegisterController.php line: 1157
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1157
+; RegisterController.php line: 1168
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1185
+; RegisterController.php line: 1196
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1188
+; RegisterController.php line: 1199
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1195
+; RegisterController.php line: 1206
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2260,100 +2260,103 @@ machinelog_element_refresh_on = ""
 ; ManageaccountElement.php line: 64
 manageaccount_element_edit_or_no_text = ""
 ;
-; ManageaccountElement.php line: 73
+; ManageaccountElement.php line: 75
 manageaccount_element_welcome = ""
 ;
-; ManageaccountElement.php line: 75
+; ManageaccountElement.php line: 77
 manageaccount_element_what_can_do = ""
 ;
-; ManageaccountElement.php line: 76
+; ManageaccountElement.php line: 78
 manageaccount_element_account_details = ""
 ;
-; ManageaccountElement.php line: 107
+; ManageaccountElement.php line: 109
 manageaccounts_element_icon = ""
 ;
-; ManageaccountElement.php line: 117
+; ManageaccountElement.php line: 119
 manageusers_element_username = "使用者名稱"
 ;
-; ManageaccountElement.php line: 124
+; ManageaccountElement.php line: 126
 manageusers_element_firstname = ""
 ;
-; ManageaccountElement.php line: 130
+; ManageaccountElement.php line: 132
 manageusers_element_lastname = ""
 ;
-; ManageaccountElement.php line: 136
+; ManageaccountElement.php line: 138
 manageusers_element_email = ""
 ;
-; ManageaccountElement.php line: 146
+; ManageaccountElement.php line: 148
 manageaccount_element_is_advertiser = ""
 ;
-; ManageaccountElement.php line: 159
+; ManageaccountElement.php line: 161
 manageaccount_element_password = ""
 ;
-; ManageaccountElement.php line: 166
+; ManageaccountElement.php line: 168
 manageaccount_element_new_password = "新的密碼"
 ;
-; ManageaccountElement.php line: 172
+; ManageaccountElement.php line: 174
 manageaccount_element_retype_password = "再次輸入新的密碼"
 ;
 ; ManageaccountElement.php line: 184
+manageaccount_element_new_recovery_qa = ""
+;
+; ManageaccountElement.php line: 216
 manageaccount_element_save = ""
 ;
-; ManageaccountElement.php line: 190
+; ManageaccountElement.php line: 222
 manageaccount_element_search_lang_settings = ""
 ;
-; ManageaccountElement.php line: 195
+; ManageaccountElement.php line: 227
 manageaccount_element_crawl_and_index = ""
 ;
-; ManageaccountElement.php line: 196
+; ManageaccountElement.php line: 228
 manageaccount_element_crawl_info = ""
 ;
-; ManageaccountElement.php line: 197
+; ManageaccountElement.php line: 229
 manageaccount_element_num_crawls = ""
 ;
-; ManageaccountElement.php line: 200
+; ManageaccountElement.php line: 232
 manageaccount_element_manage_crawls = ""
 ;
-; ManageaccountElement.php line: 205
+; ManageaccountElement.php line: 237
 manageaccount_element_groups_and_feeds = ""
 ;
-; ManageaccountElement.php line: 206
+; ManageaccountElement.php line: 238
 manageaccount_element_group_info = ""
 ;
-; ManageaccountElement.php line: 208
+; ManageaccountElement.php line: 240
 manageaccount_element_num_groups = ""
 ;
-; ManageaccountElement.php line: 211
+; ManageaccountElement.php line: 243
 manageaccount_element_num_group = ""
 ;
-; ManageaccountElement.php line: 224
+; ManageaccountElement.php line: 256
 manageaccount_element_group_wiki = ""
 ;
-; ManageaccountElement.php line: 225
+; ManageaccountElement.php line: 257
 manageaccount_element_group_stats = ""
 ;
-; ManageaccountElement.php line: 229
+; ManageaccountElement.php line: 261
 manageaccount_element_last_post = ""
 ;
-; ManageaccountElement.php line: 239
+; ManageaccountElement.php line: 271
 manageaccount_element_manage_all_groups = ""
 ;
-; ManageaccountElement.php line: 241
+; ManageaccountElement.php line: 273
 manageaccount_element_go_to_group_feed = ""
 ;
-; ManageaccountElement.php line: 242
+; ManageaccountElement.php line: 274
 manageaccount_element_crawl_mixes = ""
 ;
-; ManageaccountElement.php line: 243
+; ManageaccountElement.php line: 275
 manageaccount_element_mixes_info = ""
 ;
-; ManageaccountElement.php line: 245
+; ManageaccountElement.php line: 277
 manageaccount_element_num_mixes = ""
 ;
-; ManageaccountElement.php line: 248
+; ManageaccountElement.php line: 280
 manageaccount_element_num_mix = ""
 ;
-; ManageaccountElement.php line: 252
+; ManageaccountElement.php line: 284
 manageaccount_element_manage_mixes = ""
 ;
 ; ManageadvertisementsElement.php line: 59
diff --git a/src/views/elements/ManageaccountElement.php b/src/views/elements/ManageaccountElement.php
index af9401de1..2389ac916 100755
--- a/src/views/elements/ManageaccountElement.php
+++ b/src/views/elements/ManageaccountElement.php
@@ -69,6 +69,8 @@ class ManageaccountElement extends Element
             (isset($data['EDIT_PASSWORD'])) ? "&amp;edit_pass=false":
             "&amp;edit_pass=true");
         $disabled = (isset($data['EDIT_USER'])) ? "" : "disabled='disabled'";
+        $span_icon = 9 + ((!empty($data['RECOVERY'])) ?
+            count($data['RECOVERY']): 0);
         ?>
         <div class="current-activity">
             <h2><?= tl('manageaccount_element_welcome',
@@ -102,8 +104,8 @@ class ManageaccountElement extends Element

             <table class="name-table">
             <tr>
-            <td rowspan="8" class="user-icon-td" ><img class='user-icon'
-                id='current-icon'
+            <td rowspan="<?=$span_icon ?>" class="user-icon-td" ><img
+                class='user-icon' id='current-icon'
                 src="<?= $data['USER']['USER_ICON'] ?>" alt="<?=
                     tl('manageaccounts_element_icon') ?>" /><?php
                 if (isset($data['EDIT_USER'])) {
@@ -167,7 +169,7 @@ class ManageaccountElement extends Element
                     e(tl('manageaccount_element_new_password'))?></label></th>
                     <td><input type="password" id="new-password"
                         name="new_password"  maxlength="<?=
-                        LONG_NAME_LEN?>" class="narrow-field"/>
+                        C\LONG_NAME_LEN?>" class="narrow-field"/>
                     </td></tr>
                 <tr><th class="table-label"><label for="retype-password"><?php
                     e(tl('manageaccount_element_retype_password'));
@@ -176,7 +178,37 @@ class ManageaccountElement extends Element
                         name="retype_password"  maxlength="<?=
                         C\LONG_NAME_LEN?>" class="narrow-field" />
                     </td></tr>
-                <?php
+                    <?php
+                    $question_sets = [];
+                    if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
+                        $question_sets = [
+                            tl('manageaccount_element_new_recovery_qa') =>
+                            $data['RECOVERY']];
+                    }
+                    $i = 0;
+                    foreach ($question_sets as $name => $set) {
+                        $first = true;
+                        $num = count($set);
+                        foreach ($set as $question) {
+                            if ($first) { ?>
+                                <tr><th class="table-label"
+                                    rowspan='<?= $num
+                                    ?>' style="max-width:2in;"><?php
+                                    e($name);
+                                ?></th><td class="table-input border-top">
+                            <?php
+                            } else { ?>
+                                <tr><td class="table-input">
+                            <?php
+                            }
+                            $this->view->helper("options")->render(
+                                "question-$i", "question_$i",
+                                $question, $data['RECOVERY_ANSWERS'][$i]);
+                            $first = false;
+                            e("</td></tr>");
+                            $i++;
+                        }
+                    }
                 }
                 ?>
                 <tr><td></td>