Implements the ability to resend the account activation email, a=chris

diff --git a/src/controllers/RegisterController.php b/src/controllers/RegisterController.php
index 6f89d9f77..8db59ba07 100755
--- a/src/controllers/RegisterController.php
+++ b/src/controllers/RegisterController.php
@@ -232,6 +232,8 @@ class RegisterController extends Controller implements CrawlConstants
         }
         $this->preactivityPrerequisiteCheck($activity,
             'processRecoverData', 'recoverPassword', $data);
+        $this->preactivityPrerequisiteCheck($activity,
+            'resendComplete', 'resendRegistration', $data);
         unset($data["check_fields"]);
         $new_data = $this->call($activity);
         if ((!isset($data['IS_NEW_CAPTCHA']) || !$data['IS_NEW_CAPTCHA'])) {
@@ -339,24 +341,7 @@ class RegisterController extends Controller implements CrawlConstants
                         C\INACTIVE_STATUS, $data['PASSWORD']);
                 }
                 $user = $user_model->getUser($data['USER']);
-                $server = new MailServer(C\MAIL_SENDER, C\MAIL_SERVER,
-                    C\MAIL_SERVERPORT, C\MAIL_USERNAME, C\MAIL_PASSWORD,
-                    C\MAIL_SECURITY);
-                $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
-                    tl('register_controller_registration_email_sent').
-                    "</h1>');";
-                $subject = tl('register_controller_admin_activation_request');
-                $message = tl('register_controller_admin_email_salutation',
-                    $data['FIRST'], $data['LAST'])."\n";
-                $message .= tl('register_controller_email_body')."\n";
-                $creation_time = vsprintf('%d.%06d', gettimeofday());
-                $message .= C\BASE_URL.
-                    "?c=register&a=emailVerification&email=".
-                    $user['EMAIL'].
-                    "&hash=" . urlencode(L\crawlCrypt($user['HASH'])).
-                    "&time=" . $user['CREATION_TIME'];
-                $server->send($subject, C\MAIL_SENDER, $data['EMAIL'],
-                    $message);
+                $this->sendActivationMail($user, $data);
                 if (C\CAPTCHA_MODE == C\TEXT_CAPTCHA) {
                     if (C\RECOVERY_MODE == C\EMAIL_AND_QUESTIONS_RECOVERY) {
                         $num_questions = self::NUM_CAPTCHA_QUESTIONS +
@@ -390,8 +375,15 @@ class RegisterController extends Controller implements CrawlConstants
                         $data['FIRST'], $data['LAST'], $data['EMAIL'],
                         C\INACTIVE_STATUS, $data['PASSWORD']);
                 }
-                $this->sendActivationMail($data['FIRST'], $data['LAST'],
-                    $data['USER']);
+                $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
+                    tl('register_controller_account_request_made')."</h1>');";
+                $server = new MailServer(C\MAIL_SENDER, C\MAIL_SERVER,
+                    C\MAIL_SERVERPORT, C\MAIL_USERNAME, C\MAIL_PASSWORD,
+                    C\MAIL_SECURITY);
+                $subject = tl('register_controller_admin_activation_request');
+                $message = tl('register_controller_admin_activation_message',
+                    $first_name, $last_name, $user_name);
+                $server->send($subject, C\MAIL_SENDER, C\MAIL_SENDER, $message);
                 break;
         }
         $user = $user_model->getUser($data['USER']);
@@ -407,22 +399,28 @@ class RegisterController extends Controller implements CrawlConstants
     /**
      * Use to send the account activation email
      *
-     * @param string $first_name first name of user to send activation email for
-     * @param string $last_name last name of user to send activation email for
-     * @param string $user_name username of  user to send activation email for
+     * @param array $user associative array of user
      * @param array $data field to be sent to view so can set sent mail
      *  interface message
      */
-    function sendActivationMail($first_name, $last_name, $user_name, &$data)
+    function sendActivationMail($user, &$data)
     {
-        $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
-            tl('register_controller_account_request_made')."</h1>');";
         $server = new MailServer(C\MAIL_SENDER, C\MAIL_SERVER,
             C\MAIL_SERVERPORT, C\MAIL_USERNAME, C\MAIL_PASSWORD,
             C\MAIL_SECURITY);
+        $data['SCRIPT'] .= "doMessage('<h1 class=\"red\" >".
+            tl('register_controller_registration_email_sent').
+            "</h1>');";
         $subject = tl('register_controller_admin_activation_request');
-        $message = tl('register_controller_admin_activation_message',
-            $first_name, $last_name, $user_name);
+        $message = tl('register_controller_admin_email_salutation',
+            $user['FIRST_NAME'], $user['LAST_NAME'])."\n";
+        $message .= tl('register_controller_email_body')."\n";
+        $creation_time = vsprintf('%d.%06d', gettimeofday());
+        $message .= C\BASE_URL.
+            "?c=register&a=emailVerification&email=".
+            $user['EMAIL'].
+            "&hash=" . urlencode(L\crawlCrypt($user['HASH'])).
+            "&time=" . $user['CREATION_TIME'];
         $server->send($subject, C\MAIL_SENDER, C\MAIL_SENDER, $message);
     }
     /**
@@ -557,7 +555,7 @@ class RegisterController extends Controller implements CrawlConstants
      * This activity either verifies the recover email and sets up the
      * appropriate  data for a change password form or it verifies the
      * change password form data and changes the password. If verifications
-     * error messages are set up
+     * fail, error messages are set up
      *
      * @return array form data to be used by recover or signin views
      */
@@ -665,6 +663,64 @@ class RegisterController extends Controller implements CrawlConstants
             $data["time"]. $user['CREATION_TIME'] . C\AUTH_KEY));
         return $data;
     }
+    /**
+     * Sets up the form variables need to present the resend registration
+     * form. If this form is submitted with missing fields, this method
+     * would also be called to set up an appropriate MISSING field
+     *
+     * @return array $data field correspond to values needed for account
+     *     creation form
+     */
+    public function resendRegistration()
+    {
+        $data = $this->setupQuestionViewData();
+        $data['REFRESH'] = "resendEmail";
+        return $data;
+    }
+    /**
+     * This activity either verifies the recover email and sets up the
+     * appropriate  data for a change password form or it verifies the
+     * change password form data and changes the password. If verifications
+     * error messages are set up
+     *
+     * @return array form data to be used by recover or signin views
+     */
+    public function resendComplete()
+    {
+        $data = [];
+        $data['REFRESH'] = "signin";
+        $data['SCRIPT'] = "";
+        $user_model = $this->model("user");
+        $visitor_model = $this->model("visitor");
+        $fields = ["user"];
+        $resend_fail = "doMessage('<h1 class=\"red\" >".
+            tl('register_controller_email_resend_fail')."</h1>');";
+        foreach ($fields as $field) {
+            if (isset($_REQUEST[$field])) {
+                $data[$field] = $this->clean($_REQUEST[$field], "string");
+            } else {
+                $data['SCRIPT'] = $resend_fail;
+                return $data;
+            }
+        }
+        $user = $user_model->getUser($data["user"]);
+        if (!$user) {
+            $data['SCRIPT'] = "doMessage('<h1 class=\"red\" >".
+                tl('register_controller_email_resend_fail')."</h1>');";
+            return $data;
+        } else if ($user['STATUS'] == C\ACTIVE_STATUS) {
+            $data['SCRIPT'] = "doMessage('<h1 class=\"red\" >".
+                tl('register_controller_user_active_fail')."</h1>');";
+            return $data;
+        }
+        $this->sendActivationMail($user, $data);
+        if (isset($user['USER_ID'])) {
+            $user_model->setUserSession($user['USER_ID'], $_SESSION);
+        }
+        unset($_SESSION['CAPTCHA_ANSWERS']);
+        unset($_SESSION['CAPTCHA']);
+        return $data;
+    }
     /**
      * Used to handle data from the suggest-a-url to crawl form
      * (suggest_view.php). Basically, it saves any data submitted to
diff --git a/src/locale/ar/configure.ini b/src/locale/ar/configure.ini
index 79e152043..8de48f5d0 100755
--- a/src/locale/ar/configure.ini
+++ b/src/locale/ar/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "تعيين دليل العمل! قد
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "الرجاء تسمية الروبوت الخاص بك"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "يعمل الدليل والشخصية التي تم إنشاؤها!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "تعذر التحديث config.php الملف!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "غير قادر على إنشاء الشخصية!"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "دليل العمل هو صالح! لا يمكن إنشاء الشخصية! "
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "دليل العمل هو صالح! لا يمكن إنشاء الشخصية! "
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "تحديث الشخصية!"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "كان هناك ملفتعريف تحديث المشكلة!"
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "يرجى وصف الروبوت الخاص بك"
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = "بي إتش بي 4لإصدار 5.3 أو أحدث"
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = "configs/config.php ليس ملقم ويب للكتابة."
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = "دليل العمل يجب أن يكون قابل للكتابة من قبل ملقم ويب."
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = "pnp.ini ملف post_max_size متغيرينبغي أن يكون مالا يقل عن 32 م"
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = "مطلوب ما يلي العناصر في عداد المفقودين:  %s"
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = "كانت العناصر الاختيارية التالية مفقودة:  %s"
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = "تمرير الاختيار."
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = "استخدام configs/local_config.php حتى تغيير دليل العمل أعلاه قد لا تعمل."
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = "موجز البيانات المخزنة في
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = "يوب! بي إتش بي محرك البحث "
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/ar/statistics.txt b/src/locale/ar/statistics.txt
index b26155324..039ce78b2 100755
--- a/src/locale/ar/statistics.txt
+++ b/src/locale/ar/statistics.txt
@@ -1 +1 @@
-d:31;
\ No newline at end of file
+d:30;
\ No newline at end of file
diff --git a/src/locale/bn/configure.ini b/src/locale/bn/configure.ini
index f0822d5c0..07dc64134 100755
--- a/src/locale/bn/configure.ini
+++ b/src/locale/bn/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/de/configure.ini b/src/locale/de/configure.ini
index ad4d36b5a..0f20361f5 100755
--- a/src/locale/de/configure.ini
+++ b/src/locale/de/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini
index 7bca4a0f3..282dbe98a 100644
--- a/src/locale/en_US/configure.ini
+++ b/src/locale/en_US/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "Work Directory Set! You may need to r
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "Please Name Your robot"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "Working Directory and Profile Created!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "Unable to Update config.php File!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "Unable to Create Profile!"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "Work Directory is Invalid! Cannot Create Profile!"
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "Profile Updated!"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "There was a Problem Updating Profile!"
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "Please Describe Your Robot"
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = "PHP Version 5.4 or Newer"
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = "configs/config.php not web server writable."
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = "Work directory needs to be writable by web server. "
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = "php.ini file variable post_max_size should be at least 2M"
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = "The following required items were missing:"
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = "The following optional items were missing:"
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = "Check Passed."
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = "Using configs/LocalConfig.php so changing work directory above may not work."
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = "No Lines Match Filter!"
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = "Cookies need to be enabled to register or log in to a Yioop!"
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = "Account created successfully!!"
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = "Registration email sent!"
+; RegisterController.php line: 378
+register_controller_account_request_made = "Account registration request has been sent!"
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = "Yioop User Has Requested Activation"
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = "Dear %s %s,"
-;
-; RegisterController.php line: 339
-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: 383
+register_controller_admin_activation_message = "User %s %s with username %s has requested activation of their account."
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = "Account registration request has been sent!"
+; RegisterController.php line: 411
+register_controller_registration_email_sent = "Registration email sent!"
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = "Yioop User Has Requested Activation"
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = "User %s %s with username %s has requested activation of their account."
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = "Dear %s %s,"
+;
+; RegisterController.php line: 416
+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: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = "Email verification error!!"
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = "Account has already been activated!"
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = "Account successfully activated!!"
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = "Email verification error!!"
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = "Recover Account Email Sent!!"
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = "Yioop Account Recovery Request"
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = "Dear %s %s,"
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 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: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = "Unable to recover account!"
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = "Recover email already used!"
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = "Recover email has expired!"
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = "Password changed!"
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = "Passwords don&#039;t match!"
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = "Recover email already used!"
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = "Recover email has expired!"
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = "Resend Registration Fail!"
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = "Resend Registration Fail!"
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = "User Account Already Active!"
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = "Format of URL is invalid!"
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = "Starred fields need to be filled in correctly!"
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = "Hash Code Did Not Match!"
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = "Got human check questions wrong!"
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = "Captcha Mis-entered!"
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = "Suggest URL buffer is full! Please try again later!"
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = "Suggested URL saved!"
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = "Cookies need to be enabled to register or log in to a Yioop!"
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = "Got human check questions wrong!"
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = "Captcha Mis-entered!"
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = "Hash Code Did Not Match!"
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = "Starred fields need to be filled in correctly!"
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = "Check Email Address!"
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = "Account not created - Username already in use!!"
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = "Group Activity"
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = "%s Wiki Page Discussion"
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = "Feed"
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = "Wiki"
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = "%s User Feed"
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = "Comment"
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = "wiki"
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = "%s posts, %s threads"
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = "Last Post:"
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = "Comment"
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = "Start New Thread"
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = "Start New Thread"
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = "This group has no posts yet!"
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = "Thread does not exist! Maybe it was deleted?"
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = "Edit"
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = "Delete"
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = "%s posts"
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = "%s views"
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = "Start New Thread in %s"
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = "Start New Thread in %s"
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = "Last Edited: %s"
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = "Vote:"
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = "Last Post:"
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = "Comment"
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = "Drag items into the textarea to add them..."
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = "or click to select them."
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = "Add a Comment"
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = "Save"
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = "Subject"
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = "Post"
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = "Save"
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = "Edit Post"
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = "Subject"
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = "Post"
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = "Save"
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = "Group Feeds No Longer Updating!"
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = "Summary Data stored in Yioop for Item"
 ; RecoverView.php line: 71
 recover_view_recover_password = "Recover Account"
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = "New Password"
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = "Re-type password:"
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = "Username:"
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = "Recovery Info:"
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = "Human Check:"
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = "Human Check:"
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = "Recover Account"
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = "Return to Yioop"
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = "Password:"
 ; RegisterView.php line: 261
 register_view_retypepassword = "Re-type password:"
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = "Recovery Info:"
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = "Human Check:"
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = "Recovery Info:"
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = "Human Check:"
+;
+; RegisterView.php line: 324
 register_view_human_check = "Human Check:"
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = "By using Create Account button, I agree to the"
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = "Yioop Terms"
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = "and"
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = "Privacy Policy"
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = "."
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = "Create Account"
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = "Return to Yioop"
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = "Resend Activation"
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = "Username:"
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = "Human Check:"
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = "Human Check:"
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = "Resend Email"
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = "Return"
+;
 ; SearchView.php line: 92
 search_view_title = "Yioop - PHP Search Engine"
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = "Forgot Password?"
 ; SigninView.php line: 133
 signin_view_create_account = "Create Account"
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = "Resend Activation Email"
+;
+; SigninView.php line: 142
 signin_view_return = "Return"
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/es/configure.ini b/src/locale/es/configure.ini
index 2ce553107..0f00628cb 100755
--- a/src/locale/es/configure.ini
+++ b/src/locale/es/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "El trabajo conjunto de Directorio! Pu
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "Por favor, Nombre tu Robot"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "Directorio de Trabajo y Perfil creados!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "No se puede actualizar el archivo config.php!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "No se puede crear el perfil!"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "Directorio de trabajo es inv&aacute;lido! No se puede crear el perfil!"
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "Directorio de trabajo es inv&aacute;lido! No se puede crear el perfil!"
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "Perfil actualizado!"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "Hubo un problema al actualizar el perfil!"
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "Por favor describa su robot"
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = "PHP Version 5.4 o la M&aacute;s Reciente"
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = "configs/config.php el servidor web no es escribible."
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = "Directorio de trabajo tiene que ser escribible por el servidor web"
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = "La variable post_max_size del archivo php.ini deber�a ser de al menos 32M"
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = "Los siguientes elementos necesarios (requeridos), no estaban: %s"
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = "Los siguientes elementos opcionales, no estaban: %s"
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = "Entrada Aprobada"
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/fa/configure.ini b/src/locale/fa/configure.ini
index 95255202b..8d0822a0d 100755
--- a/src/locale/fa/configure.ini
+++ b/src/locale/fa/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "پوشهٔ کار تنظیم شد! ا
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "لطفن برای رباتتان نامی بگذارید"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "پوشهٔ کار و پروفایل ساخته شدند!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "نمی&zwnj;توان فایل config.php را به روز کرد!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "نمی&zwnj;توان پروفایل را ساخت!"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "پوشهٔ کار معتبر نیست! نمی&zwnj;توان پروفایل را ساخت!"
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "پوشهٔ کار معتبر نیست! نمی&zwnj;توان پروفایل را ساخت!"
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "پروفایل به روز شد!"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "در به روز رسانی پروفایل مشکلی پیش آمده است!"
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "لطفن رباتتان را توصیف کنید"
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = "PHP نسخهٔ ۳.۵ یا جدیدتر"
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = "وب سرور نمی&zwnj;تواند در configs/config.php بنویسد."
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = "وب سرور باید بتواند در پوشهٔ کار بنویسد."
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = "متغیر post_max_size در php.ini باید حداقل ۲ مگابایت باشد. "
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = "موارد لازم زیر خالی هستند: %s"
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = "موارد اختیاری زیر خالی هستند: %s"
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = "در بررسی مشکلی پیدا نشد."
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = "از configs/local_config.php استفاده می&zwnj;شود، بنابراین ممکن است تغییر بالا عمل نکند."
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = "هیچ خطی با این فیلتر مطابق نیست!"
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = "داده&zwnj;های خلاصه در Yioop ذخ
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = "Yioop! موتور جستجوی PHP"
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/fr_FR/configure.ini b/src/locale/fr_FR/configure.ini
index 1c2a595a8..a6e1079a0 100755
--- a/src/locale/fr_FR/configure.ini
+++ b/src/locale/fr_FR/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = "Moteur de recherche PHP -Yioop!"
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/he/configure.ini b/src/locale/he/configure.ini
index aa0f15e3e..58ffcb9ac 100755
--- a/src/locale/he/configure.ini
+++ b/src/locale/he/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "פרופייל עודכן"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "בעיה עם עדכון הפרופייל"
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/hi/configure.ini b/src/locale/hi/configure.ini
index f900a12f3..17760f94f 100755
--- a/src/locale/hi/configure.ini
+++ b/src/locale/hi/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/in_ID/configure.ini b/src/locale/in_ID/configure.ini
index 6d2f238f2..a306df371 100755
--- a/src/locale/in_ID/configure.ini
+++ b/src/locale/in_ID/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/it/configure.ini b/src/locale/it/configure.ini
index 92a7a1cce..c81a5aa3a 100755
--- a/src/locale/it/configure.ini
+++ b/src/locale/it/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "Cartella di Lavoro creata! Potrebbe e
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "Dai un nome al tuo Robot"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "Cartella di Lavoro e Profilo creati!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "Impossibile aggiornare il file config.php!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "Impossibile creare Profilo!"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!"
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "Cartella di Lavoro non valida! Impossibile creare Profilo!"
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "Profilo aggiornato!"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "C&#039;&egrave; stato un problema nell&#039;aggiornamento Profilo!"
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "Descrivi il tuo Robot"
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = "PHP Versione 5.4 o maggiore"
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = "File configs/config.php non scrivibile dal web server."
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = "La Cartella di Lavoro deve essere scrivibile dal web server. "
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = "La variabile post_max_size nel file php.ini dovrebbe essere minimo 32M"
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = "I seguenti oggetti richiesti sono mancanti: %s"
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = "I seguenti oggetti opzionali sono mancanti: %s"
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = "Controllo passato."
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = "Usando configs/local_config.php la Cartella di Lavoro sopra potrebbe non funzionare."
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = "Dati dei Sommari memorizzati in Yioop "
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = "Yioop! Motore di Ricerca in PHP"
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/ja/configure.ini b/src/locale/ja/configure.ini
index 61a4daa8f..c94fa2e63 100755
--- a/src/locale/ja/configure.ini
+++ b/src/locale/ja/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "作業ディレクトリの設定し
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "ボット名を入力してください。"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "作業ディレクトリとプロフィールの作成しました。"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "config.phpファイルのできない。更新"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "プロフィールを作成できない。"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。"
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "無効な作業ディレクト。プロフィールを作成できない。"
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "プロフィールの変更できました。"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "プロフィールの変更できない。"
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "ロボットの説明してください。"
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/kn/configure.ini b/src/locale/kn/configure.ini
index 926a0c0e5..93633b00e 100755
--- a/src/locale/kn/configure.ini
+++ b/src/locale/kn/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "ಕಾರ್ಯ ನಿರ್ದೇಶ
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = "configs/config.php ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಲ್ಲ"
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = "ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆ ವೆಬ್ ಸರ್ವರ್ ನಿಂದ ಬರೆಯಲು ಸಶಕ್ತವಾಗಿರಬೇಕು"
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = "php.ini ಕಡಿತದ ಚರಾಂಶ post_max_size ಕನಿಷ್ಠ ಪಕ್ಷ ೧೬ ಎಂ.ಬಿ. ಇರಬೇಕು"
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = "ಬರುವ ಅವಶ್ಯಕವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:"
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = "ಬರುವ ಕಡ್ಡಾಯವಲ್ಲದ ವಸ್ತುಗಳು ತಪ್ಪಿಹೋಗಿದ್ದಾವೆ:"
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = "ಪರಿಶೀಲನೆ ತೇರ್ಗಡೆಯಾಗಿದೆ"
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = "configs/local_config.php ಉಪಯೋಗದಲ್ಲಿದೆ, ಅದರಿಂದ ಮೇಲಿನ ಕಾರ್ಯ ನಿರ್ದೇಶಿಕೆಯನ್ನು ಬದಲಾವಣೆ ನಿಷ್ಕ್ರಿಯವಾಗಬಹುದು "
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = "ಯೂಪ್!, ಪಿಹೆಚಪಿ ಶೋಧನಾ ಯಂತ್ರ "
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/ko/configure.ini b/src/locale/ko/configure.ini
index b190c6eb8..33bc7be7e 100755
--- a/src/locale/ko/configure.ini
+++ b/src/locale/ko/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "작업 디렉토리가 지정 됐습
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "로봇 이름을 정해 주십시요."
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "작업 디렉토리와 프로필이 생성됐습니다."
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "config.php 파일을  업데이트 실패했습니다."
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "프로필을 생성할수 없습니다."
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다."
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "작업 디렉토리가 올바르지 않습니다. 프로필을 생성할수 없습니다."
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "프로필을 업데이트 했습니다."
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "프로필을 업데이트하는데 문제가 발생했습니다."
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "당신의 로봇을 기술해 주십시요."
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/nl/configure.ini b/src/locale/nl/configure.ini
index f58539143..5b2977192 100644
--- a/src/locale/nl/configure.ini
+++ b/src/locale/nl/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "Werken Directory Set! Het kan nodig z
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "Gelieve Naam Je robot"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "Working Directory en Profile Gemaakt!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "Niet in staat om config.php bestand bij te werken!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "Kan geen profiel maak!"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "Werk is ongeldig! Kan profiel niet maken!"
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "Werk is ongeldig! Kan profiel niet maken!"
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "Profiel ge&iuml;pdatet!"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "Er was een probleem updaten profiel!"
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "Beschrijf uw Robot"
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = "PHP versie 5.4 of nieuwer"
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = "configs / config.php niet webserver beschrijfbaar."
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = "Werk map moet beschrijfbaar door web-server te zijn."
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = "php.ini bestand variabele post_max_size moet minstens 2M"
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = "De volgende benodigde onderdelen ontbraken: %s"
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = "De volgende optionele onderdelen ontbraken: %s"
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = "Controleer Geslaagd."
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = "Met behulp van configs / local_config.php dus veranderende werk directory hierboven kan niet werken."
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = "Geen Lijnen Match Filter!"
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = "Cookies moeten worden ingeschakeld om te registreren of log in om een Yioop!"
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = "Houdend met succes aangemaakt!!"
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = "Registratie e-mail gestuurd!"
+; RegisterController.php line: 378
+register_controller_account_request_made = "Account registratie aanvraag is verzonden!"
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = "Yioop gebruiker heeft Gevraagde Activering"
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = "Geachte %s %s,"
-;
-; RegisterController.php line: 339
-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: 383
+register_controller_admin_activation_message = "Gebruiker %s %s met gebruikersnaam %s heeft verzocht de activering van hun rekening."
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = "Account registratie aanvraag is verzonden!"
+; RegisterController.php line: 411
+register_controller_registration_email_sent = "Registratie e-mail gestuurd!"
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = "Yioop gebruiker heeft Gevraagde Activering"
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = "Gebruiker %s %s met gebruikersnaam %s heeft verzocht de activering van hun rekening."
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = "Geachte %s %s,"
+;
+; RegisterController.php line: 416
+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: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = "E-mail verificatie fout!!"
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = "Account is al geactiveerd!"
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = "Account succesvol geactiveerd!!"
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = "E-mail verificatie fout!!"
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = "Recover account E Verzonden!!"
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = "Yioop Account Recovery Request"
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = "Geachte %s %s,"
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 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: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = "Niet in staat om rekening te herstellen!"
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = "Recover e-mail al gebruikt!"
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = "Recover e-mail is verlopen!"
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = "Wachtwoord veranderd!"
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = "Wachtwoorden komen niet overeen!"
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = "Recover e-mail al gebruikt!"
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = "Recover e-mail is verlopen!"
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = "Formaat van URL is ongeldig!"
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = "Starred velden moeten correct worden ingevuld!"
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = "Hash-code niet overeen!"
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = "Kreeg de menselijke controle vragen verkeerd!"
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = "Captcha Mis-aangegaan!"
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = "Suggereren URL buffer vol is! Probeer het later opnieuw!"
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = "Gesuggereerd URL gered!"
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = "Cookies moeten worden ingeschakeld om te registreren of log in om een Yioop!"
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = "Kreeg de menselijke controle vragen verkeerd!"
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = "Captcha Mis-aangegaan!"
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = "Hash-code niet overeen!"
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = "Starred velden moeten correct worden ingevuld!"
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = "Controleer e-mailadres!"
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = "Geen account aangemaakt - Gebruikersnaam al in gebruik!!"
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = "Group Activity"
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = " %s Wiki Pagina Overleg"
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = "voeden"
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = "wiki"
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = " %s Gebruiker Feed"
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = "commentaar"
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = "wiki"
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = " %s berichten, %s discussies"
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = "Laatste bericht:"
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = "commentaar"
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = "Start nieuw onderwerp"
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = "Start nieuw onderwerp"
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = "Deze groep heeft nog geen berichten!"
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = "Draad bestaat niet! Misschien was verwijderd?"
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = "uitgeven"
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = "verwijderen"
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = " %s berichten"
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = "uitzicht %s"
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = "Start nieuw onderwerp in %s"
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = "Start nieuw onderwerp in %s"
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = "Laatst gewijzigd: %s"
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = "stem:"
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = "Laatste bericht:"
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = "commentaar"
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = "Sleep items in het tekstveld om ze toe te voegen ..."
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = "of klik om ze te selecteren."
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = "Voeg een reactie toe"
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = "Opslaan"
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = "onderwerp"
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = "post"
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = "Opslaan"
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = "Bericht wijzigen"
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = "onderwerp"
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = "post"
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = "Opslaan"
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = "Groep feeds niet meer updaten!"
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = "Samenvatting De gegevens die zijn opgeslagen in
 ; RecoverView.php line: 71
 recover_view_recover_password = "Recover account"
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = "nieuw Wachtwoord"
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = "Typ het wachtwoord opnieuw:"
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = "gebruikersnaam:"
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = "Herstel Info:"
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = "Human Check:"
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = "Human Check:"
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = "Recover account"
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = "wachtwoord:"
 ; RegisterView.php line: 261
 register_view_retypepassword = "Typ het wachtwoord opnieuw:"
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = "Herstel Info:"
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = "Human Check:"
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = "Herstel Info:"
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = "Human Check:"
+;
+; RegisterView.php line: 324
 register_view_human_check = "Human Check:"
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = "Door te klikken op Account, ik ga akkoord met de"
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = "Yioop Voorwaarden"
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = "en"
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = "Privacybeleid"
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = "."
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = "Maak Een Account Aan"
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = "Yioop! PHP Zoekmachine"
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = "Wachtwoord Vergeten?"
 ; SigninView.php line: 133
 signin_view_create_account = "Maak Een Account Aan"
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/pl/configure.ini b/src/locale/pl/configure.ini
index 74c267c85..5957ee889 100755
--- a/src/locale/pl/configure.ini
+++ b/src/locale/pl/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/pt/configure.ini b/src/locale/pt/configure.ini
index 39f6455f9..d8589162b 100755
--- a/src/locale/pt/configure.ini
+++ b/src/locale/pt/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/ru/configure.ini b/src/locale/ru/configure.ini
index 7327a6bfc..355c8b1a2 100755
--- a/src/locale/ru/configure.ini
+++ b/src/locale/ru/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/te/configure.ini b/src/locale/te/configure.ini
index 7ab03cfe2..345ed9fed 100644
--- a/src/locale/te/configure.ini
+++ b/src/locale/te/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "వర్క్ డైరెక్ట
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "దయచేసి మీ రోబోట్ కి పేరు పెట్టండి"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "వర్కింగ్ డైరెక్టరీ మరియు ప్రొఫైల్ క్రియేట్ చేయబడినది!"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "config.php ఫైల్ అప్డేట్ చేయుట సాధ్యపడలేదు!"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "ప్రొఫైల్ తయారు చేయుట సాధ్యపడలేదు!"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "వర్క్ డైరెక్టరీ చెల్లదు! ప్రొఫైల్ సృష్టించలేరు!"
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "వర్క్ డైరెక్టరీ చెల్లదు! ప్రొఫైల్ సృష్టించలేరు!"
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "ప్రొఫైల్ అప్డేట్ చేయబడినది!"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "ప్రొఫైల్ నవీకరణలో సమస్య వున్నది! "
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "మీ రోబోట్ ని దయచేసి వివరించండి"
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = "PHP వెర్షన్ 5.4 లేదా ఇంకా క్రొత్తది"
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = "క్రింది అవసరమైన అంశాలు మిస్ అయినవి: %s"
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = "క్రింది ఆప్షనల్ అంశాలు మిస్ అయినవి: %s"
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = "ఖాతావిజయవంతంగా సృష్టించబడినది!!"
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = "నమోదు ఇమెయిల్ పంపిచబడినది!"
+; RegisterController.php line: 378
+register_controller_account_request_made = "ఖాతా నమోదు అభ్యర్థన పంపబడింది!"
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = "Yioop యూజర్ ఆక్టివేట్ చేయమని అభ్యర్థించారు"
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = "ప్రియమైన %s %s,"
-;
-; RegisterController.php line: 339
-register_controller_email_body = "ఈ ఇమెయిల్ ఖాతా నమోదు అభ్యర్థనలో ఇవ్వబడింది. మీకు Yioop ఖాతాఫై ఆసక్తి ఉంటే, దయచేసి నమోదు ప్రక్రియ పూర్తి చేయడానికి ఈ క్రింది చిరునామాను ఉపయోగించండి."
+; RegisterController.php line: 383
+register_controller_admin_activation_message = "యూజర్ %s %s పేరు తో %s వారి ఖాతా ఆక్టివేషన్ అభ్యర్థించారు."
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = "ఖాతా నమోదు అభ్యర్థన పంపబడింది!"
+; RegisterController.php line: 411
+register_controller_registration_email_sent = "నమోదు ఇమెయిల్ పంపిచబడినది!"
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = "Yioop యూజర్ ఆక్టివేట్ చేయమని అభ్యర్థించారు"
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = "యూజర్ %s %s పేరు తో %s వారి ఖాతా ఆక్టివేషన్ అభ్యర్థించారు."
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = "ప్రియమైన %s %s,"
+;
+; RegisterController.php line: 416
+register_controller_email_body = "ఈ ఇమెయిల్ ఖాతా నమోదు అభ్యర్థనలో ఇవ్వబడింది. మీకు Yioop ఖాతాఫై ఆసక్తి ఉంటే, దయచేసి నమోదు ప్రక్రియ పూర్తి చేయడానికి ఈ క్రింది చిరునామాను ఉపయోగించండి."
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = "ఇమెయిల్ ధృవీకరణ లోపం!!"
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = "ఖాతా ఇదివరకే యాక్టివేట్ చేయబడింది!"
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = "ఖాతా విజయవంతంగా యాక్టివేట్ చేయబడింది"
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = "ఇమెయిల్ ధృవీకరణ లోపం!!"
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = "ఖాతా పునరుద్ధరన ఇమెయిల్ పంపిచబడినది!!"
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = "Yioop ఖాతా పునరుద్ధరన అభ్యర్థన"
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = "ప్రియమైన %s %s,"
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = "ఖాతా పునరుద్ధరించలేకపోయింది!"
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = "పునరుద్ధరన ఇమెయిల్ ఇదివరకే వాడబడినది!"
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = "పునరుద్ధరన ఇమెయిల్ గడువు ముగిసింది!"
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = "పాస్ వర్డ్ మార్చబడినది!"
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = "పాస్ వర్డ్స్ సరిపోలడం లేదు!"
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = "పునరుద్ధరన ఇమెయిల్ ఇదివరకే వాడబడినది!"
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = "పునరుద్ధరన ఇమెయిల్ గడువు ముగిసింది!"
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = "యుఆర్ఎల్ యొక్క ఫార్మాట్ చెల్లదు!"
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = "స్టార్ ఉన్న ఫీల్డ్స్ తప్పని సరిగా పూర్తి చేయాలి!"
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = "హాష్ కోడ్ సరిపోలడం లేదు!"
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = "మానవ చెక్ ప్రశ్నలు తప్పు వచ్చాయి!"
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = "కాప్చ సరికాదు!"
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = "సూచించిన యుఆర్ఎల్ బఫర్ నిండి పోయినది. దయచేసి కాసేపు ఆగి మరలా ప్రయత్నించండి!"
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = "సూచించిన యుఆర్ఎల్ సేవ్ చేయబడినది!"
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = "మానవ చెక్ ప్రశ్నలు తప్పు వచ్చాయి!"
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = "కాప్చ సరికాదు!"
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = "హాష్ కోడ్ సరిపోలడం లేదు!"
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = "స్టార్ ఉన్న ఫీల్డ్స్ తప్పని సరిగా పూర్తి చేయాలి!"
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = "ఇ-మెయిల్ చిరునామా మరోసారి పరిశీలించండి! "
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = "ఖాతా సృస్టించలేదు - యూజర్ పేరు వాడుకలో వున్నది!!"
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = "%s వికీ పేజీ చర్చ"
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = "ఫీడ్"
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = "వికీ "
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = "%s యూజర్ ఫీడ్"
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = "వ్యాఖ్య"
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = "వికీ"
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = "%sపోస్ట్లు, %sథ్రెడ్లు"
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = "ఆఖరి పోస్ట్:"
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = "వ్యాఖ్య"
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = "క్రొత్త థ్రెడ్ మొదలుపెట్టండి"
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = "క్రొత్త థ్రెడ్ మొదలుపెట్టండి"
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = "ఈ గ్రూప్ లో ఇంకా పోస్ట్లు లేవు!"
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = "థ్రెడ్ ఉనికిలో లేదు! ఇది తొలగించబడి ఉండవచ్చు?"
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = "ఎడిట్"
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = "డిలీట్"
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = "%s పోస్ట్లు"
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = "%s వ్యూస్"
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = "క్రొత్త థ్రెడ్ %s"
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = "క్రొత్త థ్రెడ్ %s"
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = "చివరిగా సవరించబడింది: %s"
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = "వోట్:"
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = "ఆఖరి పోస్ట్:"
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = "వ్యాఖ్య"
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = "వ్యాఖ్యను జోడించండి"
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = "సేవ్"
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = "విషయం"
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = "పోస్ట్"
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = "సేవ్"
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = "పోస్ట్ లను సవరించు"
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = "విషయం"
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = "పోస్ట్"
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = "సేవ్"
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = "గ్రూప్ ఫీడ్స్ అప్డేట్ అవడంలేదు!"
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = "క్రొత్త పాస్&zwnj;వర్డ్ "
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = "పాస్&zwnj;వర్డ్ మరలా టైపు చెయ్యండి:"
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = "యూజర్ పేరు:"
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = "పాస్&zwnj;వర్డ్:"
 ; RegisterView.php line: 261
 register_view_retypepassword = "పాస్&zwnj;వర్డ్ మరలా టైపు చెయ్యండి:"
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = "ఖాతా సృష్టించు ని క్లిక్ చేయడం ద్వారా నేను అంగీకరిస్తున్నాను"
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = "Yioop నిబంధనలు"
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = "అండ్"
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = "ప్రైవసీ పాలసీ"
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = "."
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = "ఖాతా సృష్టించు"
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = "యూప్ ! పిహెచ్పి సెర్చ్ ఇంజిన్"
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = "పాస్&zwnj;వర్డ్ మర్చ
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/te/statistics.txt b/src/locale/te/statistics.txt
index 4c4bfa69f..2a8ca5e0d 100755
--- a/src/locale/te/statistics.txt
+++ b/src/locale/te/statistics.txt
@@ -1 +1 @@
-d:59;
\ No newline at end of file
+d:58;
\ No newline at end of file
diff --git a/src/locale/th/configure.ini b/src/locale/th/configure.ini
index 05dce2438..450214e20 100755
--- a/src/locale/th/configure.ini
+++ b/src/locale/th/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/tr/configure.ini b/src/locale/tr/configure.ini
index 4c49316fc..5f0a57891 100755
--- a/src/locale/tr/configure.ini
+++ b/src/locale/tr/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = ""
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = ""
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = ""
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = ""
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = ""
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = ""
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/vi_VN/configure.ini b/src/locale/vi_VN/configure.ini
index a7acb1192..3f0b50a0f 100755
--- a/src/locale/vi_VN/configure.ini
+++ b/src/locale/vi_VN/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "C&ocirc;ng việc thiết lập thư
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "Đặt t&ecirc;n cho r&ocirc; b&ocirc; của bạn"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "Thư mục l&agrave;m việc v&agrave; hồ sơ được tạo ra"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "Kh&ocirc;ng thể cập nhật hồ sơ config.php"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "Kh&ocirc;ng thể tạo hồ sơ"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = "C&ocirc;ng t&aacute;c thư mục kh&ocirc;ng hợp lệ"
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = "C&ocirc;ng t&aacute;c thư mục kh&ocirc;ng hợp lệ"
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = "Hồ sơ được cập nhật"
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = "C&oacute; sự trở ngaị về việc cập nhật hồ sơ "
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = "Diễn tả r&ocirc; b&ocirc; của bạn"
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = ""
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = ""
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = ""
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = ""
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = ""
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = ""
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = "Kiểm tra được th&ocirc;ng qua"
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = ""
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = ""
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/locale/zh_CN/configure.ini b/src/locale/zh_CN/configure.ini
index d2f09c3f8..327231820 100755
--- a/src/locale/zh_CN/configure.ini
+++ b/src/locale/zh_CN/configure.ini
@@ -1377,181 +1377,190 @@ system_component_configure_work_dir_set = "工作目錄配置"
 ; SystemComponent.php line: 1018
 system_component_name_your_bot = "取名"
 ;
-; SystemComponent.php line: 1040
+; SystemComponent.php line: 1039
 system_component_configure_work_profile_made = "工作設置已建立"
 ;
-; SystemComponent.php line: 1044
+; SystemComponent.php line: 1043
 system_component_configure_no_set_config = "無設置"
 ;
-; SystemComponent.php line: 1051
+; SystemComponent.php line: 1050
 system_component_configure_no_create_profile = "未建立簡歷"
 ;
-; SystemComponent.php line: 1058
+; SystemComponent.php line: 1057
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1065
+; SystemComponent.php line: 1064
 system_component_configure_work_dir_invalid = ""
 ;
-; SystemComponent.php line: 1094
+; SystemComponent.php line: 1093
 system_component_configure_profile_change = ""
 ;
-; SystemComponent.php line: 1098
+; SystemComponent.php line: 1097
 system_component_configure_no_change_profile = ""
 ;
-; SystemComponent.php line: 1118
+; SystemComponent.php line: 1117
 system_component_describe_robot = ""
 ;
-; SystemComponent.php line: 1172
+; SystemComponent.php line: 1171
 system_component_php_version = "PHP版本"
 ;
-; SystemComponent.php line: 1180
+; SystemComponent.php line: 1179
 system_component_no_write_config_php = "PHP未寫入"
 ;
-; SystemComponent.php line: 1185
+; SystemComponent.php line: 1184
 system_component_no_write_work_dir = "未寫入目錄"
 ;
-; SystemComponent.php line: 1190
+; SystemComponent.php line: 1189
 system_component_post_size_small = "張貼小容量"
 ;
-; SystemComponent.php line: 1196
+; SystemComponent.php line: 1195
 system_component_missing_required = "缺少必要項目"
 ;
-; SystemComponent.php line: 1220
+; SystemComponent.php line: 1219
 system_component_missing_optional = "缺少選擇項目"
 ;
-; SystemComponent.php line: 1226
+; SystemComponent.php line: 1225
 system_component_check_passed = "通過檢查"
 ;
-; SystemComponent.php line: 1231
+; SystemComponent.php line: 1230
 system_component_using_local_config = "使用當地語言"
 ;
 ; MachineController.php line: 193
 machine_controller_nolines = ""
 ;
-; RegisterController.php line: 250
+; RegisterController.php line: 263
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 316
+; RegisterController.php line: 329
 register_controller_account_created = ""
 ;
-; RegisterController.php line: 334
-register_controller_registration_email_sent = ""
+; RegisterController.php line: 378
+register_controller_account_request_made = ""
 ;
-; RegisterController.php line: 336
+; RegisterController.php line: 382
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 337
-register_controller_admin_email_salutation = ""
-;
-; RegisterController.php line: 339
-register_controller_email_body = ""
+; RegisterController.php line: 383
+register_controller_admin_activation_message = ""
 ;
-; RegisterController.php line: 373
-register_controller_account_request_made = ""
+; RegisterController.php line: 411
+register_controller_registration_email_sent = ""
 ;
-; RegisterController.php line: 377
+; RegisterController.php line: 413
 register_controller_admin_activation_request = ""
 ;
-; RegisterController.php line: 378
-register_controller_admin_activation_message = ""
+; RegisterController.php line: 414
+register_controller_admin_email_salutation = ""
+;
+; RegisterController.php line: 416
+register_controller_email_body = ""
 ;
-; RegisterController.php line: 420
+; RegisterController.php line: 452
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 426
+; RegisterController.php line: 458
 register_controller_already_activated = ""
 ;
-; RegisterController.php line: 433
+; RegisterController.php line: 465
 register_controller_account_activated = ""
 ;
-; RegisterController.php line: 436
+; RegisterController.php line: 468
 register_controller_email_verification_error = ""
 ;
-; RegisterController.php line: 484
+; RegisterController.php line: 516
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 493
+; RegisterController.php line: 527
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 497
+; RegisterController.php line: 531
 register_controller_account_recover_email = ""
 ;
-; RegisterController.php line: 501
+; RegisterController.php line: 535
 register_controller_recover_request = ""
 ;
-; RegisterController.php line: 502
+; RegisterController.php line: 536
 register_controller_admin_email_salutation = ""
 ;
-; RegisterController.php line: 504
+; RegisterController.php line: 538
 register_controller_recover_body = ""
 ;
-; RegisterController.php line: 538
+; RegisterController.php line: 573
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 550
+; RegisterController.php line: 585
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 564
+; RegisterController.php line: 599
 register_controller_account_recover_fail = ""
 ;
-; RegisterController.php line: 571
+; RegisterController.php line: 606
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 575
+; RegisterController.php line: 610
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 581
+; RegisterController.php line: 616
 register_controller_password_changed = ""
 ;
-; RegisterController.php line: 589
+; RegisterController.php line: 624
 register_controller_passwords_dont_match = ""
 ;
-; RegisterController.php line: 603
+; RegisterController.php line: 638
 register_controller_recovered_already = ""
 ;
-; RegisterController.php line: 607
+; RegisterController.php line: 642
 register_controller_recovery_expired = ""
 ;
-; RegisterController.php line: 735
+; RegisterController.php line: 696
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 708
+register_controller_email_resend_fail = ""
+;
+; RegisterController.php line: 712
+register_controller_user_active_fail = ""
+;
+; RegisterController.php line: 830
 register_controller_invalid_url = ""
 ;
-; RegisterController.php line: 739
+; RegisterController.php line: 834
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 752
+; RegisterController.php line: 847
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 762
+; RegisterController.php line: 857
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 789
+; RegisterController.php line: 884
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 824
+; RegisterController.php line: 919
 register_controller_suggest_full = ""
 ;
-; RegisterController.php line: 828
+; RegisterController.php line: 923
 register_controller_url_submitted = ""
 ;
-; RegisterController.php line: 1030
+; RegisterController.php line: 1125
 register_controller_need_cookies = ""
 ;
-; RegisterController.php line: 1036
+; RegisterController.php line: 1131
 register_controller_failed_human = ""
 ;
-; RegisterController.php line: 1051
+; RegisterController.php line: 1146
 register_controller_failed_graphical_human = ""
 ;
-; RegisterController.php line: 1062
+; RegisterController.php line: 1157
 register_controller_failed_hashcode = ""
 ;
-; RegisterController.php line: 1090
+; RegisterController.php line: 1185
 register_controller_error_fields = ""
 ;
-; RegisterController.php line: 1093
+; RegisterController.php line: 1188
 register_controller_check_email = ""
 ;
-; RegisterController.php line: 1100
+; RegisterController.php line: 1195
 register_controller_user_already_exists = ""
 ;
 ; SearchController.php line: 280
@@ -2131,106 +2140,106 @@ groupfeed_element_group_activity = ""
 ; GroupfeedElement.php line: 135
 groupfeed_element_wiki_thread = ""
 ;
-; GroupfeedElement.php line: 155
+; GroupfeedElement.php line: 153
 groupfeed_element_feed = ""
 ;
-; GroupfeedElement.php line: 160
+; GroupfeedElement.php line: 158
 group_view_wiki = ""
 ;
-; GroupfeedElement.php line: 162
+; GroupfeedElement.php line: 160
 groupfeed_element_user = ""
 ;
-; GroupfeedElement.php line: 206
+; GroupfeedElement.php line: 204
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 241
+; GroupfeedElement.php line: 239
 manageaccount_element_group_wiki = ""
 ;
-; GroupfeedElement.php line: 242
+; GroupfeedElement.php line: 240
 manageaccount_element_group_stats = ""
 ;
-; GroupfeedElement.php line: 247
+; GroupfeedElement.php line: 245
 manageaccount_element_last_post = ""
 ;
-; GroupfeedElement.php line: 291
+; GroupfeedElement.php line: 289
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 301
+; GroupfeedElement.php line: 299
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 314
+; GroupfeedElement.php line: 312
 groupfeed_element_start_thread = ""
 ;
-; GroupfeedElement.php line: 320
+; GroupfeedElement.php line: 318
 groupfeed_element_no_posts_yet = ""
 ;
-; GroupfeedElement.php line: 325
+; GroupfeedElement.php line: 323
 groupfeed_element_thread_no_exist = ""
 ;
-; GroupfeedElement.php line: 358
+; GroupfeedElement.php line: 356
 groupfeed_element_edit = ""
 ;
-; GroupfeedElement.php line: 363
+; GroupfeedElement.php line: 361
 groupfeed_element_delete = ""
 ;
-; GroupfeedElement.php line: 385
+; GroupfeedElement.php line: 383
 groupfeed_element_num_posts = ""
 ;
-; GroupfeedElement.php line: 395
+; GroupfeedElement.php line: 393
 groupfeed_element_num_views = ""
 ;
-; GroupfeedElement.php line: 420
+; GroupfeedElement.php line: 418
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 422
+; GroupfeedElement.php line: 420
 groupfeed_element_start_thread_in_group = ""
 ;
-; GroupfeedElement.php line: 438
+; GroupfeedElement.php line: 436
 groupfeed_element_last_edited = ""
 ;
-; GroupfeedElement.php line: 454
+; GroupfeedElement.php line: 452
 groupfeed_element_post_vote = ""
 ;
-; GroupfeedElement.php line: 481
+; GroupfeedElement.php line: 479
 groupfeed_element_last_post_info = ""
 ;
-; GroupfeedElement.php line: 497
+; GroupfeedElement.php line: 495
 groupfeed_element_comment = ""
 ;
-; GroupfeedElement.php line: 551
+; GroupfeedElement.php line: 549
 fileupload_helper_drag_textarea = ""
 ;
-; GroupfeedElement.php line: 552
+; GroupfeedElement.php line: 550
 fileupload_helper_click_textarea = ""
 ;
-; GroupfeedElement.php line: 576
+; GroupfeedElement.php line: 574
 groupfeed_element_add_comment = ""
 ;
-; GroupfeedElement.php line: 590
+; GroupfeedElement.php line: 588
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 628
+; GroupfeedElement.php line: 626
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 635
+; GroupfeedElement.php line: 633
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 648
+; GroupfeedElement.php line: 646
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 683
+; GroupfeedElement.php line: 681
 groupfeed_element_edit_post = ""
 ;
-; GroupfeedElement.php line: 686
+; GroupfeedElement.php line: 684
 groupfeed_element_subject = ""
 ;
-; GroupfeedElement.php line: 691
+; GroupfeedElement.php line: 689
 groupfeed_element_post = ""
 ;
-; GroupfeedElement.php line: 704
+; GroupfeedElement.php line: 702
 groupfeed_element_save = ""
 ;
-; GroupfeedElement.php line: 732
+; GroupfeedElement.php line: 730
 groupfeed_element_no_longer_update = ""
 ;
 ; MachinelogElement.php line: 57
@@ -4091,28 +4100,28 @@ nocache_view_summary_contents = ""
 ; RecoverView.php line: 71
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 104
+; RecoverView.php line: 109
 register_view_new_password = ""
 ;
-; RecoverView.php line: 116
+; RecoverView.php line: 121
 register_view_retypepassword = ""
 ;
-; RecoverView.php line: 131
+; RecoverView.php line: 136
 recover_view_username = ""
 ;
-; RecoverView.php line: 147
+; RecoverView.php line: 152
 register_view_account_recovery = ""
 ;
-; RecoverView.php line: 157
+; RecoverView.php line: 162
 register_view_human_check = ""
 ;
-; RecoverView.php line: 189
+; RecoverView.php line: 194
 register_view_human_check = ""
 ;
-; RecoverView.php line: 206
+; RecoverView.php line: 211
 recover_view_recover_password = ""
 ;
-; RecoverView.php line: 215
+; RecoverView.php line: 220
 recover_view_return = ""
 ;
 ; RegisterView.php line: 76
@@ -4280,39 +4289,60 @@ register_view_password = ""
 ; RegisterView.php line: 261
 register_view_retypepassword = ""
 ;
-; RegisterView.php line: 277
+; RegisterView.php line: 279
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 281
+; RegisterView.php line: 285
 register_view_human_check = ""
 ;
-; RegisterView.php line: 283
+; RegisterView.php line: 287
 register_view_account_recovery = ""
 ;
-; RegisterView.php line: 315
+; RegisterView.php line: 291
+register_view_human_check = ""
+;
+; RegisterView.php line: 324
 register_view_human_check = ""
 ;
-; RegisterView.php line: 329
+; RegisterView.php line: 338
 register_view_i_agree = ""
 ;
-; RegisterView.php line: 331
+; RegisterView.php line: 340
 register_view_terms = ""
 ;
-; RegisterView.php line: 333
+; RegisterView.php line: 342
 register_view_and = ""
 ;
-; RegisterView.php line: 335
+; RegisterView.php line: 344
 register_view_privacy = ""
 ;
-; RegisterView.php line: 336
+; RegisterView.php line: 345
 register_view_period = ""
 ;
-; RegisterView.php line: 346
+; RegisterView.php line: 355
 register_view_create_account = ""
 ;
-; RegisterView.php line: 355
+; RegisterView.php line: 364
 register_view_return = ""
 ;
+; ResendEmailView.php line: 69
+resendemail_view_resend_activation = ""
+;
+; ResendEmailView.php line: 92
+resendemail_view_username = ""
+;
+; ResendEmailView.php line: 108
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 139
+resendemail_view_human_check = ""
+;
+; ResendEmailView.php line: 156
+resendemail_view_resend_email = ""
+;
+; ResendEmailView.php line: 165
+resendemail_view_return = ""
+;
 ; SearchView.php line: 92
 search_view_title = "PHP 搜索引擎 - Yioop!"
 ;
@@ -4418,7 +4448,10 @@ signin_view_recover_password = ""
 ; SigninView.php line: 133
 signin_view_create_account = ""
 ;
-; SigninView.php line: 137
+; SigninView.php line: 138
+signin_view_resend_activation = ""
+;
+; SigninView.php line: 142
 signin_view_return = ""
 ;
 ; StaticView.php line: 68
diff --git a/src/views/RecoverView.php b/src/views/RecoverView.php
index db78c10d3..0d50607a4 100644
--- a/src/views/RecoverView.php
+++ b/src/views/RecoverView.php
@@ -83,12 +83,17 @@ class RecoverView extends View
                 value='<?= $_SESSION["request_time"] ?>' />
             <input type='hidden' name='level' id='level'
                 value='<?= $_SESSION["level"] ?>' />
-            <input type='hidden' name='time' id='time' value='<?= time() ?>'/>
+            <input type='hidden' name='time' id='time' value='<?=
+                (isset($data["RECOVER_COMPLETE"])) ? $data['time']: time() ?>'/>
             <?php
+                $time_done = true;
             }
             if (isset($data["RECOVER_COMPLETE"])) { ?>
                 <input type="hidden" name="user" value="<?=$data['user'] ?>" />
-                <input type="hidden" name="time" value="<?=$data['time'] ?>" />
+                <?php if (empty($time_done)) { ?>
+                    <input type="hidden" name="time"
+                        value="<?=$data['time'] ?>" />
+                <?php } ?>
                 <input type="hidden" name="finish_hash" value="<?=
                     $data['finish_hash'] ?>" />
             <?php
diff --git a/src/views/SigninView.php b/src/views/SigninView.php
index b57f08b70..fcaaeb088 100755
--- a/src/views/SigninView.php
+++ b/src/views/SigninView.php
@@ -132,6 +132,11 @@ class SigninView extends View
                         if ($logged_in) {
                             e('&amp;'.C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN]);
                         }?>"><?=tl('signin_view_create_account') ?></a></li>
+                    <li><a href="<?=B\controllerUrl('register', true)
+                        ?>a=resendRegistration<?php
+                        if ($logged_in) {
+                            e('&amp;'.C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN]);
+                        }?>"><?=tl('signin_view_resend_activation')?></a></li>
                 <?php
                 }
             ?>