Tweak a human check question so clearer, fixes ZKP authentication email registration, a=chris

diff --git a/src/controllers/RegisterController.php b/src/controllers/RegisterController.php
index 60fadb197..250bc19a3 100755
--- a/src/controllers/RegisterController.php
+++ b/src/controllers/RegisterController.php
@@ -301,7 +301,8 @@ class RegisterController extends Controller implements CrawlConstants
             "register_validator_js_retype_password_not_matched" =>
             tl('register_validator_js_retype_password_not_matched'),
             ];
-        if (in_array('register_validator', $data['INCLUDE_SCRIPTS'])) {
+        if (!empty($data['INCLUDE_SCRIPTS']) &&
+            in_array('register_validator', $data['INCLUDE_SCRIPTS'])) {
             $data['SCRIPT'] .= 'tl = '.json_encode($tl).';setSubmitStatus';
         }
         $this->displayView($view, $data);
@@ -1351,9 +1352,11 @@ class RegisterController extends Controller implements CrawlConstants
                 }
             }
         }
+        $max_password_len = (C\AUTHENTICATION_MODE == C\ZKP_AUTHENTICATION) ?
+            C\LONG_NAME_LEN *2 : C\LONG_NAME_LEN;
         if (isset($_REQUEST['password'])
             && isset($_REQUEST['repassword']) &&
-            (strlen($_REQUEST['password']) > C\LONG_NAME_LEN
+            (strlen($_REQUEST['password']) > $max_password_len
             || $this->clean($_REQUEST['password'], "string" ) !=
             $this->clean($_REQUEST['repassword'], "string" ))) {
             $error = true;
diff --git a/src/locale/en_US/configure.ini b/src/locale/en_US/configure.ini
index a54c797ea..6996d15c2 100644
--- a/src/locale/en_US/configure.ini
+++ b/src/locale/en_US/configure.ini
@@ -1493,7 +1493,7 @@ register_view_question0_least = "Which lives or lasts the shortest?"
 register_view_question0_choices = "lightning,bacteria,ant,dog,horse,person,oak tree,planet,star,galaxy"
 register_view_question1_most = "Which is more abundant?"
 register_view_question1_least = "Which is less abundant?"
-register_view_question1_choices = "continents,countries,subways,cities,doctors,people,hands,teeth,hair,cells,molecules,atoms,protons"
+register_view_question1_choices = "continents,countries,subways,cities,doctors,people,hair,cells,molecules,atoms,protons"
 register_view_question2_most = "Which is usually more pricey?"
 register_view_question2_least = "Which is usually less pricey?"
 register_view_question2_choices = "a postage stamp,cup of coffee,movie ticket,shoes,bicycle,one month's rent,car,house,a power plant"
diff --git a/src/views/elements/SecurityElement.php b/src/views/elements/SecurityElement.php
index c87ef3fd1..fa08d5a0c 100755
--- a/src/views/elements/SecurityElement.php
+++ b/src/views/elements/SecurityElement.php
@@ -100,10 +100,6 @@ class SecurityElement extends Element
                 ?>
             </fieldset>
             </div>
-            <div class="top-margin center"><button
-                class="button-box" type="submit"><?=tl('security_element_save')
-                ?></button>
-            </div>
             <div class="top-margin">
             <fieldset>
                 <legend><label