diff --git a/config/packages/security.php b/config/packages/security.php
index ada7dd2..e0a1599 100644
--- a/config/packages/security.php
+++ b/config/packages/security.php
@@ -27,6 +27,8 @@
     $mainFirewall->anonymous();
     $mainFirewall
         ->formLogin()
+        ->usernameParameter('number')
+        ->passwordParameter('password')
         ->loginPath('login')
         ->checkPath('login');
     $mainFirewall
diff --git a/config/services.php b/config/services.php
index b627e05..a42290d 100644
--- a/config/services.php
+++ b/config/services.php
@@ -5,6 +5,7 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use BikeShare\App\Configuration;
+use BikeShare\App\EventListener\ErrorListener;
 use BikeShare\Credit\CodeGenerator\CodeGenerator;
 use BikeShare\Credit\CodeGenerator\CodeGeneratorInterface;
 use BikeShare\Credit\CreditSystem;
@@ -41,6 +42,14 @@
             param('kernel.environment'),
         ]);
 
+    $services->set('exception_listener', ErrorListener::class)
+        ->args([
+            param('kernel.error_controller'),
+            service('logger'),
+            param('kernel.debug'),
+        ])
+        ->tag('kernel.event_subscriber');
+
     $services->set(Configuration::class)
         ->args([__DIR__ . '/../config.php']);
 
@@ -49,6 +58,7 @@
             '../src/Db/MysqliDbResult.php',
             '../src/SmsConnector/SmsGateway/SmsGateway.php',
             '../src/App/Configuration.php',
+            '../src/App/EventListener/ErrorListener.php',
             '../src/App/Kernel.php',
             '../src/App/Entity',
         ]);
diff --git a/src/App/EventListener/ErrorListener.php b/src/App/EventListener/ErrorListener.php
new file mode 100644
index 0000000..9df5649
--- /dev/null
+++ b/src/App/EventListener/ErrorListener.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BikeShare\App\EventListener;
+
+use Symfony\Component\HttpKernel\EventListener\ErrorListener as SymfonyErrorListener;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+
+class ErrorListener extends SymfonyErrorListener
+{
+    protected function logException(\Throwable $exception, string $message, string $logLevel = null): void
+    {
+        if (null !== $this->logger) {
+            if (!$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500) {
+                $this->logger->critical($message, ['exception' => $exception]);
+            } elseif ($exception instanceof NotFoundHttpException) {
+                //do not log 404 errors
+                return;
+            } else {
+                $this->logger->error($message, ['exception' => $exception]);
+            }
+        }
+    }
+}
diff --git a/src/App/Security/TokenProvider.php b/src/App/Security/TokenProvider.php
index 4354856..ba82014 100644
--- a/src/App/Security/TokenProvider.php
+++ b/src/App/Security/TokenProvider.php
@@ -54,8 +54,7 @@ public function updateToken(string $series, string $tokenValue, \DateTime $lastU
 
         $token = new PersistentToken(
             $currentToken->getClass(),
-            method_exists($currentToken, 'getUserIdentifier') ?
-                $currentToken->getUserIdentifier() : $currentToken->getUsername(),
+            $currentToken->getUserIdentifier(),
             $series,
             $tokenValue,
             $lastUsed
@@ -83,7 +82,7 @@ public function createNewToken(PersistentTokenInterface $token)
         $this->db->query(
             "INSERT INTO remember_me_tokens (class, username, series, value, lastUsed) 
             VALUES ('{$token->getClass()}',
-                    '{$token->getUsername()}',
+                    '{$token->getUserIdentifier()}',
                     '{$token->getSeries()}',
                     '{$token->getTokenValue()}',
                     '{$token->getLastUsed()->format('Y-m-d H:i:s')}')"
diff --git a/src/Controller/SecurityController.php b/src/Controller/SecurityController.php
index 55f0ad4..ad0bbdf 100644
--- a/src/Controller/SecurityController.php
+++ b/src/Controller/SecurityController.php
@@ -58,7 +58,7 @@ public function resetPassword(
         TranslatorInterface $translator
     ) {
         if ($request->isMethod('POST')) {
-            $number = $request->request->get('_username');
+            $number = $request->request->get('number');
 
             try {
                 $user = $userProvider->loadUserByIdentifier($number);
diff --git a/src/Mail/DebugMailSender.php b/src/Mail/DebugMailSender.php
index b3bb01c..d17d51c 100644
--- a/src/Mail/DebugMailSender.php
+++ b/src/Mail/DebugMailSender.php
@@ -1,11 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace BikeShare\Mail;
 
+use Psr\Log\LoggerInterface;
+
 class DebugMailSender implements MailSenderInterface
 {
+    private LoggerInterface $logger;
+
+    public function __construct(
+        LoggerInterface $logger
+    ) {
+        $this->logger = $logger;
+    }
+
     public function sendMail($recipient, $subject, $message)
     {
-        echo $recipient, ' | ', $subject, ' | ', $message . PHP_EOL;
+        $this->logger->debug('Sending email', compact('recipient', 'subject', 'message'));
     }
 }
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index dd3dcd1..a7a4a0e 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -11,7 +11,7 @@
                 <label for="username">
                     {% if isSmsSystemEnabled %}{{ 'Phone number:'|trans }}{% else %}{{ 'User number:'|trans }}{% endif %}
                 </label>
-                <input type="text" id="username" name="_username" value="{{ last_username }}" class="form-control" required autofocus>
+                <input type="text" id="username" name="number" value="{{ last_username }}" class="form-control" required autofocus>
             </div>
 
             <div class="form-group">
@@ -21,7 +21,7 @@
                         (<a href="{{ path('reset_password') }}">{{ 'Forgotten? Reset password'|trans }}</a>)
                     </small>
                 </label>
-                <input type="password" id="password" name="_password" class="form-control" required>
+                <input type="password" id="password" name="password" class="form-control" required>
             </div>
 
             <div class="form-group form-check">
diff --git a/templates/security/reset_password.html.twig b/templates/security/reset_password.html.twig
index e785169..1611ca0 100644
--- a/templates/security/reset_password.html.twig
+++ b/templates/security/reset_password.html.twig
@@ -14,7 +14,7 @@
                 <label for="username">
                     {% if isSmsSystemEnabled %}{{ 'Phone number:'|trans }}{% else %}{{ 'User number:'|trans }}{% endif %}
                 </label>
-                <input type="text" id="username" name="_username" value="" class="form-control" required autofocus>
+                <input type="text" id="username" name="number" value="" class="form-control" required autofocus>
             </div>
 
             <button type="submit" class="btn btn-primary btn-block">
diff --git a/tests/Mail/DebugMailSenderTest.php b/tests/Mail/DebugMailSenderTest.php
index 6bc8b5c..c3d34d0 100644
--- a/tests/Mail/DebugMailSenderTest.php
+++ b/tests/Mail/DebugMailSenderTest.php
@@ -1,9 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Test\BikeShare\Mail;
 
 use BikeShare\Mail\DebugMailSender;
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 
 class DebugMailSenderTest extends TestCase
 {
@@ -12,8 +15,13 @@ public function testSendMail()
         $recipient = 'recipient';
         $subject = 'subject';
         $message = 'message';
-        $mailer = new DebugMailSender();
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $mailer = new DebugMailSender($loggerMock);
+
+        $loggerMock->expects($this->once())
+            ->method('debug')
+            ->with('Sending email', compact('recipient', 'subject', 'message'));
+
         $mailer->sendMail($recipient, $subject, $message);
-        $this->expectOutputString($recipient . ' | ' . $subject . ' | ' . $message . PHP_EOL);
     }
 }