diff --git a/Resources/config/two_factor.xml b/Resources/config/two_factor.xml
index 7ab50b2c..db18492a 100644
--- a/Resources/config/two_factor.xml
+++ b/Resources/config/two_factor.xml
@@ -62,7 +62,7 @@
 
 		<service id="scheb_two_factor.security.form_renderer" class="Scheb\TwoFactorBundle\Security\TwoFactor\Provider\DefaultTwoFactorFormRenderer" lazy="true">
 			<argument type="service" id="twig" />
-			<argument>%scheb_two_factor.email.template%</argument>
+			<argument>@SchebTwoFactor/Authentication/form.html.twig</argument>
 		</service>
 
 		<!-- Alias for auto-wiring -->
diff --git a/Resources/config/two_factor_provider_email.xml b/Resources/config/two_factor_provider_email.xml
index 877e297e..af042dc8 100644
--- a/Resources/config/two_factor_provider_email.xml
+++ b/Resources/config/two_factor_provider_email.xml
@@ -17,7 +17,10 @@
 
 		<service id="scheb_two_factor.security.email.code_generator" alias="scheb_two_factor.security.email.default_code_generator" />
 
-		<service id="scheb_two_factor.security.email.form_renderer" alias="scheb_two_factor.security.form_renderer" />
+        <service id="scheb_two_factor.security.email.form_renderer" class="Scheb\TwoFactorBundle\Security\TwoFactor\Provider\DefaultTwoFactorFormRenderer" lazy="true">
+            <argument type="service" id="twig" />
+            <argument>%scheb_two_factor.email.template%</argument>
+        </service>
 
 		<service id="scheb_two_factor.security.email.provider" class="Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Email\EmailTwoFactorProvider">
 			<tag name="scheb_two_factor.provider" alias="email" />
diff --git a/Resources/config/two_factor_provider_google.xml b/Resources/config/two_factor_provider_google.xml
index 2669f8bd..3fe2bd2a 100644
--- a/Resources/config/two_factor_provider_google.xml
+++ b/Resources/config/two_factor_provider_google.xml
@@ -12,7 +12,10 @@
 			<argument>%scheb_two_factor.google.window%</argument>
 		</service>
 
-		<service id="scheb_two_factor.security.google.form_renderer" alias="scheb_two_factor.security.form_renderer" />
+		<service id="scheb_two_factor.security.google.form_renderer" class="Scheb\TwoFactorBundle\Security\TwoFactor\Provider\DefaultTwoFactorFormRenderer" lazy="true">
+			<argument type="service" id="twig" />
+			<argument>%scheb_two_factor.google.template%</argument>
+		</service>
 
 		<service id="scheb_two_factor.security.google.provider" class="Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorTwoFactorProvider">
 			<tag name="scheb_two_factor.provider" alias="google" />
diff --git a/Resources/config/two_factor_provider_totp.xml b/Resources/config/two_factor_provider_totp.xml
index 4e2676b8..5872ec46 100644
--- a/Resources/config/two_factor_provider_totp.xml
+++ b/Resources/config/two_factor_provider_totp.xml
@@ -12,7 +12,10 @@
 			<argument>%scheb_two_factor.totp.window%</argument>
 		</service>
 
-		<service id="scheb_two_factor.security.totp.form_renderer" alias="scheb_two_factor.security.form_renderer" />
+		<service id="scheb_two_factor.security.totp.form_renderer" class="Scheb\TwoFactorBundle\Security\TwoFactor\Provider\DefaultTwoFactorFormRenderer" lazy="true">
+			<argument type="service" id="twig" />
+			<argument>%scheb_two_factor.totp.template%</argument>
+		</service>
 
 		<service id="scheb_two_factor.security.totp.provider" class="Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Totp\TotpAuthenticatorTwoFactorProvider">
 			<tag name="scheb_two_factor.provider" alias="totp" />
diff --git a/Tests/DependencyInjection/SchebTwoFactorExtensionTest.php b/Tests/DependencyInjection/SchebTwoFactorExtensionTest.php
index 927e52b7..752a5dc0 100644
--- a/Tests/DependencyInjection/SchebTwoFactorExtensionTest.php
+++ b/Tests/DependencyInjection/SchebTwoFactorExtensionTest.php
@@ -132,8 +132,8 @@ public function load_googleAuthEnabled_loadGoogleServices(): void
 
         $this->assertHasDefinition('scheb_two_factor.security.google_totp_factory');
         $this->assertHasDefinition('scheb_two_factor.security.google_authenticator');
+        $this->assertHasDefinition('scheb_two_factor.security.google.form_renderer');
         $this->assertHasDefinition('scheb_two_factor.security.google.provider');
-        $this->assertAlias('scheb_two_factor.security.google.form_renderer', 'scheb_two_factor.security.form_renderer');
     }
 
     /**
@@ -146,8 +146,8 @@ public function load_totpAuthEnabled_loadTotpFactoryServices(): void
 
         $this->assertHasDefinition('scheb_two_factor.security.totp_factory');
         $this->assertHasDefinition('scheb_two_factor.security.totp_authenticator');
+        $this->assertHasDefinition('scheb_two_factor.security.totp.form_renderer');
         $this->assertHasDefinition('scheb_two_factor.security.totp.provider');
-        $this->assertAlias('scheb_two_factor.security.totp.form_renderer', 'scheb_two_factor.security.form_renderer');
     }
 
     /**
@@ -161,7 +161,6 @@ public function load_emailAuthEnabled_loadEmailServices(): void
         $this->assertHasDefinition('scheb_two_factor.security.email.default_auth_code_mailer');
         $this->assertHasDefinition('scheb_two_factor.security.email.default_code_generator');
         $this->assertHasDefinition('scheb_two_factor.security.email.provider');
-        $this->assertAlias('scheb_two_factor.security.email.form_renderer', 'scheb_two_factor.security.form_renderer');
     }
 
     /**