diff --git a/src/QUI/FrontendUsers/Controls/Registration.php b/src/QUI/FrontendUsers/Controls/Registration.php
index 344bba062e6ebbc21fd1b0a3f55ff21c82cbc421..7b1a1e438132c8042df81ac6933dcc952da368bc 100644
--- a/src/QUI/FrontendUsers/Controls/Registration.php
+++ b/src/QUI/FrontendUsers/Controls/Registration.php
@@ -129,7 +129,7 @@ public function getBody(): string
 
                 $Engine->assign(
                     'error',
-                    QUI::getLocale()->get('quiqqer/frontend-user', 'controls.Registation.general_error')
+                    QUI::getLocale()->get('quiqqer/frontend-users', 'controls.Registation.general_error')
                 );
             }
         }
diff --git a/src/QUI/FrontendUsers/Controls/RegistrationSignUp.html b/src/QUI/FrontendUsers/Controls/RegistrationSignUp.html
index cfc8405777b8d3786224fbe55e6be2a274aedb09..79bb67e43252101cf15e2627d2ceef3b297d61e2 100644
--- a/src/QUI/FrontendUsers/Controls/RegistrationSignUp.html
+++ b/src/QUI/FrontendUsers/Controls/RegistrationSignUp.html
@@ -6,8 +6,8 @@
 
 {if isset($fireUserActivationEvent)}
     <script>
-        require(['qui/QUI'], function(QUI) {
-            (function() {
+        require(['qui/QUI'], function (QUI) {
+            (function () {
                 QUI.fireEvent('quiqqerFrontendUsersUserActivate', [
                     '{$User->getUUID()}',
                     '{$registrarHash}',
@@ -23,64 +23,62 @@
         style="display: none"
 >
     {if $showLoggedInWarning}
-    <div class="quiqqer-fu-registrationSignUp-registration-logged-in message-information">
-        {locale group="quiqqer/frontend-users" var="message.types.registration.already_registered"}
-    </div>
+        <div class="quiqqer-fu-registrationSignUp-registration-logged-in message-information">
+            {locale group="quiqqer/frontend-users" var="message.types.registration.already_registered"}
+        </div>
     {else}
 
-    {if $msgSuccess}
-    <div class="content-message-success">
-        {$msgSuccess}
-        {if $redirect}
-        <span data-redirecturl="{$redirect}" class="quiqqer-fu-registrationSignUp-registration-redirect">
+        {if $msgSuccess}
+            <div class="content-message-success">
+                {$msgSuccess}
+                {if $redirect}
+                    <span data-redirecturl="{$redirect}" class="quiqqer-fu-registrationSignUp-registration-redirect">
             {locale group="quiqqer/frontend-users" var="RegistrationSignUp.message.redirect" url=$redirect}
             </span>
-        {elseif $nextLinksText}
-        <p class="quiqqer-fu-registrationSignUp-registration-nextlinks">
-            {$nextLinksText}
-        </p>
-        {/if}
-    </div>
-    {elseif $msgError}
-    <div class="content-message-error">
-        {$msgError}
-    </div>
-    {else}
-    {if $this->getAttribute('header')}
-        <h2>{locale group="quiqqer/frontend-users" var="control.registration.sign.up.title"}</h2>
-    {/if}
-    <div class="quiqqer-fu-registrationSignUp-registration-social">
-        {foreach $Registrars as $Registrar}
-        <form action=""
-              method="POST"
-              class="quiqqer-fu-registrationSignUp-registration-social-entry {$Registrar->getAttribute('icon-css-class')}"
-              data-registrar="{$Registrar->getHash()}"
-              data-registration_id="{$registrationId}"
-        >
-            {$this->getRegistrarIcon($Registrar)}
-            <input type="hidden" name="registrar" value="{$Registrar->getHash()}"/>
-            <input type="hidden" name="registration" value="1"/>
-            <input type="hidden" name="registration_id" value="{$registrationId}"/>
-        </form>
-        {/foreach}
-    </div>
-
-    {if !$msgSuccess && $Email}
-        {if $Registrars->count()}
-            {locale group="quiqqer/frontend-users" var="control.registration.sign.up.message.between"}
-        {/if}
-
-        <form name="quiqqer-fu-registrationSignUp-email"
-              class="quiqqer-fu-registrationSignUp-registration-email"
-              data-registrar="{$Email->getHash()}"
-              data-registration_id="{$registrationId}"
-        >
-            <section class="quiqqer-fu-registrationSignUp-email-mailSection">
-                <label>
+                {elseif $nextLinksText}
+                    <p class="quiqqer-fu-registrationSignUp-registration-nextlinks">
+                        {$nextLinksText}
+                    </p>
+                {/if}
+            </div>
+        {elseif $msgError}
+            <div class="content-message-error">
+                {$msgError}
+            </div>
+        {else}
+            {if $this->getAttribute('header')}
+                <h2>{locale group="quiqqer/frontend-users" var="control.registration.sign.up.title"}</h2>
+            {/if}
+            <div class="quiqqer-fu-registrationSignUp-registration-social">
+                {foreach $Registrars as $Registrar}
+                    <form action=""
+                          method="POST"
+                          class="quiqqer-fu-registrationSignUp-registration-social-entry {$Registrar->getAttribute('icon-css-class')}"
+                          data-registrar="{$Registrar->getHash()}"
+                          data-registration_id="{$registrationId}"
+                    >
+                        {$this->getRegistrarIcon($Registrar)}
+                        <input type="hidden" name="registrar" value="{$Registrar->getHash()}"/>
+                        <input type="hidden" name="registration" value="1"/>
+                        <input type="hidden" name="registration_id" value="{$registrationId}"/>
+                    </form>
+                {/foreach}
+            </div>
+            {if !$msgSuccess && $Email}
+                {if $Registrars->count()}
+                    {locale group="quiqqer/frontend-users" var="control.registration.sign.up.message.between"}
+                {/if}
+                <form name="quiqqer-fu-registrationSignUp-email"
+                      class="quiqqer-fu-registrationSignUp-registration-email"
+                      data-registrar="{$Email->getHash()}"
+                      data-registration_id="{$registrationId}"
+                >
+                    <section class="quiqqer-fu-registrationSignUp-email-mailSection">
+                        <label>
                     <span class="label">
                         {locale group="quiqqer/frontend-users" var="control.registration.sign.up.email.title"}
                     </span>
-                    <span class="field">
+                            <span class="field">
                     <span class="icon fa fa-envelope"></span>
                         <input type="email"
                                name="email"
@@ -89,106 +87,109 @@
                                {if $this->getAttribute('autocomplete')}autocomplete="email"{else}autocomplete="false"{/if}
                         />
                     </span>
-                </label>
-
-                {if $useCaptcha && $isCaptchaInvisible}
-                <div class="visible">
-                    {$captchaHTML}
-                </div>
-                {/if}
-
-                <div class="quiqqer-fu-registrationSignUp-email-buttons">
-                    {if $RegistrationTrial && $this->getAttribute('registration-trial')}
-                    <button type="submit" name="trial-account">
-                        {locale group="quiqqer/frontend-users" var="control.registration.sign.up.try"}
-                    </button>
-                    <input type="hidden"
-                           name="registration-trial-registrator"
-                           value="{$RegistrationTrial->getHash()}"
-                    />
+                        </label>
+
+                        {if $useCaptcha && $isCaptchaInvisible}
+                            <div class="visible">
+                                {$captchaHTML}
+                            </div>
+                        {/if}
+
+                        <div class="quiqqer-fu-registrationSignUp-email-buttons">
+                            {if $RegistrationTrial && $this->getAttribute('registration-trial')}
+                                <button type="submit" name="trial-account">
+                                    {locale group="quiqqer/frontend-users" var="control.registration.sign.up.try"}
+                                </button>
+                                <input type="hidden"
+                                       name="registration-trial-registrator"
+                                       value="{$RegistrationTrial->getHash()}"
+                                />
+                            {/if}
+                            <button type="submit" name="email-next">
+                                {locale group="quiqqer/frontend-users" var="control.registration.sign.up.password.next"}
+                            </button>
+                        </div>
+                    </section>
+
+                    {if $useCaptcha && $isCaptchaInvisible === false}
+                        {$captchaHTML}
                     {/if}
-                    <button type="submit" name="email-next">
-                        {locale group="quiqqer/frontend-users" var="control.registration.sign.up.password.next"}
-                    </button>
-                </div>
-            </section>
 
-            {if $useCaptcha && $isCaptchaInvisible === false}
-                {$captchaHTML}
-            {/if}
-
-            {if $fullnameInput !== 'none'}
-            <section class="quiqqer-fu-registrationSignUp-email-fullnameSection">
-                <label>
+                    {if $fullnameInput !== 'none'}
+                        <section class="quiqqer-fu-registrationSignUp-email-fullnameSection">
+                            <label>
                     <span class="label">
                         {locale group="quiqqer/frontend-users" var="control.registration.sign.up.firstname.title"}
                     </span>
-                    <span class="field">
+                                <span class="field">
                     <span class="icon fa fa-user"></span>
-                        <input type="text" name="firstname"{if $fullnameInput === 'firstname_required' || $fullnameInput === 'fullname_required'} data-required="1"{/if}/>
+                        <input type="text"
+                               name="firstname"{if $fullnameInput === 'firstname_required' || $fullnameInput === 'fullname_required'} data-required="1"{/if}/>
                     </span>
-                </label>
+                            </label>
 
-                {if $fullnameInput === 'fullname_optional' || fullname_optional === 'fullname_required'}
-                <label>
+                            {if $fullnameInput === 'fullname_optional' || fullname_optional === 'fullname_required'}
+                                <label>
                     <span class="label">
                         {locale group="quiqqer/frontend-users" var="control.registration.sign.up.lastname.title"}
                     </span>
-                    <span class="field">
+                                    <span class="field">
                     <span class="icon fa fa-user"></span>
-                        <input type="text" name="lastname"{if $fullnameInput === 'fullname_required'} data-required="1"{/if}/>
+                        <input type="text"
+                               name="lastname"{if $fullnameInput === 'fullname_required'} data-required="1"{/if}/>
                     </span>
-                </label>
-                {/if}
-
-                <div class="quiqqer-fu-registrationSignUp-email-buttons">
-                    <button type="submit" name="fullname-next">
-                        {locale group="quiqqer/frontend-users" var="control.registration.sign.up.fullname.next"}
-                    </button>
-                </div>
-            </section>
-            {/if}
+                                </label>
+                            {/if}
+
+                            <div class="quiqqer-fu-registrationSignUp-email-buttons">
+                                <button type="submit" name="fullname-next">
+                                    {locale group="quiqqer/frontend-users" var="control.registration.sign.up.fullname.next"}
+                                </button>
+                            </div>
+                        </section>
+                    {/if}
 
-            {if $passwordInput !== 'none'}
-            <section class="quiqqer-fu-registrationSignUp-email-passwordSection">
-                <label>
+                    {if $passwordInput !== 'none'}
+                        <section class="quiqqer-fu-registrationSignUp-email-passwordSection">
+                            <label>
                     <span class="label">
                         {locale group="quiqqer/frontend-users" var="control.registration.sign.up.password.title"}
                     </span>
-                    <span class="field">
+                                <span class="field">
                     <span class="icon fa fa-key"></span>
                         <input type="password" name="password" required autocomplete="off"/>
                     </span>
-                </label>
-
-                <div class="quiqqer-fu-registrationSignUp-email-buttons">
-                    <button type="submit" name="create-account">
-                        {locale group="quiqqer/frontend-users" var="control.registration.sign.up.password.next"}
-                    </button>
-                </div>
-            </section>
+                            </label>
+
+                            <div class="quiqqer-fu-registrationSignUp-email-buttons">
+                                <button type="submit" name="create-account">
+                                    {locale group="quiqqer/frontend-users" var="control.registration.sign.up.password.next"}
+                                </button>
+                            </div>
+                        </section>
+                    {/if}
+                </form>
             {/if}
-        </form>
-    {/if}
-
-    <div class="quiqqer-fu-registrationSignUp-terms">
+            <div class="quiqqer-fu-registrationSignUp-terms">
         <span class="quiqqer-fu-registrationSignUp-terms-text">
             {$termsPrivacyMessage}
 
+            {template_event name="quiqqer::frontend-users::RegistrationSignUp::termsAfter"}
+
             <button name="decline"
                     title="{locale group='quiqqer/frontend-users' var='control.registration.sign.up.button.terms.decline'}"
             >
                 <span class="fa fa-close"></span>
             </button>
         </span>
-        <div class="quiqqer-fu-registrationSignUp-terms-buttons"></div>
-    </div>
-    {/if}
+                <div class="quiqqer-fu-registrationSignUp-terms-buttons"></div>
+            </div>
+        {/if}
     {/if}
 </section>
 
 {if !empty($this->getAttribute('content')) && $showContent && !$msgSuccess && !$msgError}
-<section class="quiqqer-fu-registrationSignUp-info" style="display: none">
-    {$this->getAttribute('content')}
-</section>
+    <section class="quiqqer-fu-registrationSignUp-info" style="display: none">
+        {$this->getAttribute('content')}
+    </section>
 {/if}