diff --git a/src/Maker/MakeAuthenticator.php b/src/Maker/MakeAuthenticator.php
index ba9402907..a7621848a 100644
--- a/src/Maker/MakeAuthenticator.php
+++ b/src/Maker/MakeAuthenticator.php
@@ -206,7 +206,7 @@ function ($answer) {
                 $command->addArgument('always-remember-me', InputArgument::REQUIRED);
 
                 $supportRememberMeType = $io->choice(
-                    'When activate the remember me?',
+                    'How should remember me be activated?',
                     array_keys($supportRememberMeValues),
                     key($supportRememberMeValues)
                 );
diff --git a/src/Resources/skeleton/authenticator/login_form.tpl.php b/src/Resources/skeleton/authenticator/login_form.tpl.php
index 4124397ac..2fdef9745 100644
--- a/src/Resources/skeleton/authenticator/login_form.tpl.php
+++ b/src/Resources/skeleton/authenticator/login_form.tpl.php
@@ -25,15 +25,13 @@
     <input type="hidden" name="_csrf_token"
            value="{{ csrf_token('authenticate') }}"
     >
-<?php if($support_remember_me): ?>
-<?php if(!$always_remember_me): ?>
+<?php if($support_remember_me && !$always_remember_me): ?>
 
     <div class="checkbox mb-3">
         <label>
             <input type="checkbox" name="_remember_me"> Remember me
         </label>
     </div>
-<?php endif; ?>
 <?php endif; ?>
 
     <button class="btn btn-lg btn-primary" type="submit">