diff --git a/templates/bundles/FOSUserBundle/Registration/confirmed.html.twig b/templates/bundles/FOSUserBundle/Registration/confirmed.html.twig
index 4ddfbc05..a63f131d 100644
--- a/templates/bundles/FOSUserBundle/Registration/confirmed.html.twig
+++ b/templates/bundles/FOSUserBundle/Registration/confirmed.html.twig
@@ -1,6 +1,6 @@
 {% extends '@AdminLTE/FOSUserBundle/Registration/confirmed.html.twig' %}
 
-{% block logo_login %}{% include 'partials/login_logo.html.twig' %}{% endblock %}
+{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
 {% block title %}{{ 'browser.title'|trans }}{% endblock %}
 
 {% block head %}
diff --git a/templates/bundles/FOSUserBundle/Registration/register.html.twig b/templates/bundles/FOSUserBundle/Registration/register.html.twig
index 123ec9f7..74deca46 100644
--- a/templates/bundles/FOSUserBundle/Registration/register.html.twig
+++ b/templates/bundles/FOSUserBundle/Registration/register.html.twig
@@ -1,6 +1,6 @@
 {% extends '@AdminLTE/FOSUserBundle/Registration/register.html.twig' %}
 
-{% block logo_login %}{% include 'partials/login_logo.html.twig' %}{% endblock %}
+{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
 {% block title %}{{ 'browser.title'|trans }}{% endblock %}
 
 {% block head %}
diff --git a/templates/bundles/FOSUserBundle/Resetting/request.html.twig b/templates/bundles/FOSUserBundle/Resetting/request.html.twig
index 96b2f5f2..e766ef08 100644
--- a/templates/bundles/FOSUserBundle/Resetting/request.html.twig
+++ b/templates/bundles/FOSUserBundle/Resetting/request.html.twig
@@ -1,6 +1,6 @@
 {% extends '@AdminLTE/FOSUserBundle/Resetting/request.html.twig' %}
 
-{% block logo_login %}{% include 'partials/login_logo.html.twig' %}{% endblock %}
+{% block logo_login %}{% include 'partials/logo_login.html.twig' %}{% endblock %}
 {% block title %}{{ 'browser.title'|trans }}{% endblock %}
 
 {% block head %}
diff --git a/tests/Controller/SecurityControllerTest.php b/tests/Controller/SecurityControllerTest.php
new file mode 100644
index 00000000..bc1ad42c
--- /dev/null
+++ b/tests/Controller/SecurityControllerTest.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Tests\Controller;
+
+use Symfony\Component\HttpFoundation\RedirectResponse;
+
+/**
+ * This test makes sure the login and registration work as expected.
+ * They live in the FOSUserBundle and are tested already, but we use a different layout.
+ *
+ * @group integration
+ */
+class SecurityControllerTest extends ControllerBaseTest
+{
+    public function testRootUrlIsRedirectedToLogin()
+    {
+        $client = self::createClient();
+        $client->request('GET', '/');
+
+        $this->assertIsRedirect($client, $this->createUrl('/homepage'));
+        $client->followRedirect();
+        $this->assertIsRedirect($client, $this->createUrl('/login'));
+    }
+
+    public function testLoginPageIsRendered()
+    {
+        $client = self::createClient();
+        $this->request($client, '/login');
+
+        $response = $client->getResponse();
+        $this->assertTrue($client->getResponse()->isSuccessful());
+
+        $content = $response->getContent();
+        $this->assertContains('<title>Kimai - Time Tracking</title>', $content);
+        $this->assertContains('<form action="/en/login_check" method="post">', $content);
+        $this->assertContains('<input type="text" name="_username"', $content);
+        $this->assertContains('<input name="_password" type="password"', $content);
+        $this->assertContains('<input id="remember_me" name="_remember_me" type="checkbox"', $content);
+        $this->assertContains('">Login</button>', $content);
+        $this->assertContains('<input type="hidden" name="_csrf_token" value="', $content);
+        $this->assertContains('<a href="/en/register/"', $content);
+        $this->assertContains('Register a new account', $content);
+    }
+
+    public function testRegisterAccountPageIsRendered()
+    {
+        $client = self::createClient();
+        $this->request($client, '/register/');
+
+        $response = $client->getResponse();
+        $this->assertTrue($response->isSuccessful());
+
+        $content = $response->getContent();
+        $this->assertContains('<title>Kimai - Time Tracking</title>', $content);
+        $this->assertContains('Register a new account', $content);
+        $this->assertContains('<form name="fos_user_registration_form" method="post" action="/en/register/" class="fos_user_registration_register">', $content);
+        $this->assertContains('<input type="email"', $content);
+        $this->assertContains('id="fos_user_registration_form_email" name="fos_user_registration_form[email]" required="required" class="form-control"', $content);
+        $this->assertContains('<input type="text"', $content);
+        $this->assertContains('id="fos_user_registration_form_username" name="fos_user_registration_form[username]" required="required" maxlength="60" pattern=".{3,}" class="form-control"', $content);
+        $this->assertContains('<input type="password"', $content);
+        $this->assertContains('id="fos_user_registration_form_plainPassword_first" name="fos_user_registration_form[plainPassword][first]" required="required" autocomplete="new-password" class="form-control"', $content);
+        $this->assertContains('id="fos_user_registration_form_plainPassword_second" name="fos_user_registration_form[plainPassword][second]" required="required" autocomplete="new-password" class="form-control"', $content);
+        $this->assertContains('<input type="hidden"', $content);
+        $this->assertContains('id="fos_user_registration_form__token" name="fos_user_registration_form[_token]" class=" form-control"', $content);
+        $this->assertContains('>Register</button>', $content);
+    }
+
+    public function testRegisterAccount()
+    {
+        $client = self::createClient();
+        $this->request($client, '/register/');
+
+        $response = $client->getResponse();
+        $this->assertTrue($response->isSuccessful());
+
+        $form = $client->getCrawler()->filter('form[name=fos_user_registration_form]')->form();
+        $client->submit($form, [
+            'fos_user_registration_form' => [
+                'email' => 'test@example.com',
+                'username' => 'example',
+                'plainPassword' => [
+                    'first' => 'test123',
+                    'second' => 'test123',
+                ],
+            ]
+        ]);
+
+        $this->assertIsRedirect($client, $this->createUrl('/register/confirmed'));
+        $client->followRedirect();
+        $this->assertTrue($client->getResponse()->isSuccessful());
+
+        $content = $client->getResponse()->getContent();
+        $this->assertContains('<title>Kimai - Time Tracking</title>', $content);
+        $this->assertContains('<p>Congrats example, your account is now activated.</p>', $content);
+        $this->assertContains('<a href="/en/homepage">', $content);
+    }
+}