diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
index b534186957..84cb7e372f 100644
--- a/Classes/Controller/AbstractController.php
+++ b/Classes/Controller/AbstractController.php
@@ -172,7 +172,8 @@ public function updateAllConfirmed(User $user)
                     'changes' => UserUtility::getDirtyPropertiesFromUser($existingUser),
                     'settings' => $this->settings,
                 ],
-                $this->config['edit.']['email.']['notifyAdmin.'] ?? []
+                $this->config['edit.']['email.']['notifyAdmin.'] ?? [],
+                $this->request
             );
         }
 
@@ -208,7 +209,8 @@ public function updateRequest($user)
                     'changes' => $dirtyProperties,
                     'hash' => HashUtility::createHashForUser($user),
                 ],
-                $this->config['edit.']['email.']['updateRequest.'] ?? []
+                $this->config['edit.']['email.']['updateRequest.'] ?? [],
+                $this->request
             );
             $this->logUtility->log(
                 Log::STATUS_PROFILEUPDATEREFUSEDADMIN,
@@ -263,7 +265,8 @@ public function finalCreate(
                     ConfigurationUtility::getValue('new./email./createUserNotify./subject.', $this->config),
                 ),
                 $variables,
-                ConfigurationUtility::getValue('new./email./createUserNotify.', $this->config)
+                ConfigurationUtility::getValue('new./email./createUserNotify.', $this->config),
+                $this->request
             );
         }
 
@@ -288,7 +291,8 @@ public function finalCreate(
                     ConfigurationUtility::getValue('new./email./createAdminNotify./subject.', $this->config)
                 ),
                 $variables,
-                ConfigurationUtility::getValue('new./email./createAdminNotify.', $this->config)
+                ConfigurationUtility::getValue('new./email./createAdminNotify.', $this->config),
+                $this->request
             );
         }
 
@@ -351,7 +355,7 @@ protected function redirectByAction($action = 'new', $category = 'redirect')
 
         // if redirect target
         if ($target) {
-            $this->redirectToUri(StringUtility::removeDoubleSlashesFromUri($target));
+            return $this->redirectToUri(StringUtility::removeDoubleSlashesFromUri($target));
         }
     }
 
@@ -545,7 +549,8 @@ public function sendCreateUserConfirmationMail(User $user)
                 'user' => $user,
                 'hash' => HashUtility::createHashForUser($user),
             ],
-            ConfigurationUtility::getValue('new./email./createUserConfirmation.', $this->config)
+            ConfigurationUtility::getValue('new./email./createUserConfirmation.', $this->config),
+            $this->request
         );
     }
 }
diff --git a/Classes/Controller/NewController.php b/Classes/Controller/NewController.php
index ca00b1c889..7950480716 100644
--- a/Classes/Controller/NewController.php
+++ b/Classes/Controller/NewController.php
@@ -18,6 +18,7 @@
 use In2code\Femanager\Utility\HashUtility;
 use In2code\Femanager\Utility\LocalizationUtility;
 use In2code\Femanager\Utility\StringUtility;
+use In2code\Femanager\Utility\TemplateUtility;
 use In2code\Femanager\Utility\UserUtility;
 use JsonException;
 use Psr\Http\Message\ResponseInterface;
@@ -29,6 +30,7 @@
 use TYPO3\CMS\Extbase\Event\Mvc\AfterRequestDispatchedEvent;
 use TYPO3\CMS\Extbase\Persistence\Exception\IllegalObjectTypeException;
 use TYPO3\CMS\Extbase\Persistence\Exception\UnknownObjectException;
+use TYPO3\CMS\Fluid\View\StandaloneView;
 
 /**
  * Class NewController
@@ -67,6 +69,7 @@ public function newAction(User $user = null): ResponseInterface
     #[Validate(['validator' => CaptchaValidator::class, 'param' => 'user'])]
     public function createAction(User $user): ResponseInterface
     {
+
         if ($this->ratelimiterService->isLimited()) {
             $this->addFlashMessage(
                 LocalizationUtility::translate('ratelimiter_too_many_attempts'),
@@ -156,7 +159,7 @@ public function confirmCreateRequestAction(int $user, string $hash, string $stat
         }
 
         if ($furtherFunctions) {
-            $this->redirectByAction('new', $status . 'Redirect');
+            return $this->redirectByAction('new', $status . 'Redirect');
         }
 
         return $this->redirect('new');
@@ -283,7 +286,8 @@ protected function statusAdminConfirmationRefused(User $user, $hash, $status): b
                     ['sender@femanager.org' => 'Sender Name'],
                     'Your profile was refused',
                     ['user' => $user],
-                    ConfigurationUtility::getValue('new./email./createUserNotifyRefused.', $this->config)
+                    ConfigurationUtility::getValue('new./email./createUserNotifyRefused.', $this->config),
+                    $this->request
                 );
             }
             $this->userRepository->remove($user);
@@ -370,7 +374,8 @@ protected function createAdminConfirmationRequest(User $user)
                     'user' => $user,
                     'hash' => HashUtility::createHashForUser($user)
                 ],
-                ConfigurationUtility::getValue('new./email./createAdminConfirmation.', $this->config)
+                ConfigurationUtility::getValue('new./email./createAdminConfirmation.', $this->config),
+                $this->request
             );
             $this->addFlashMessage(LocalizationUtility::translate('createRequestWaitingForAdminConfirm'));
         }
diff --git a/Classes/Domain/Service/SendMailService.php b/Classes/Domain/Service/SendMailService.php
index 7068a8d0d1..7aafe1bdd3 100644
--- a/Classes/Domain/Service/SendMailService.php
+++ b/Classes/Domain/Service/SendMailService.php
@@ -14,6 +14,7 @@
 use TYPO3\CMS\Core\Mail\Mailer;
 use TYPO3\CMS\Core\Mail\MailMessage;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Extbase\Mvc\RequestInterface;
 
 /**
  * Class SendMailService
@@ -61,7 +62,8 @@ public function send(
         array $sender,
         string $subject,
         array $variables = [],
-        array $typoScript = []
+        array $typoScript = [],
+        RequestInterface|null $request = null
     ): bool {
         if (false === $this->isMailEnabled($typoScript, $receiver)) {
             return false;
@@ -70,7 +72,7 @@ public function send(
         $this->contentObjectStart($variables);
         $email = GeneralUtility::makeInstance(MailMessage::class);
         $variables = $this->embedImages($variables, $typoScript, $email);
-        $this->prepareMailObject($template, $receiver, $sender, $subject, $variables, $email);
+        $this->prepareMailObject($template, $receiver, $sender, $subject, $variables, $email, $request);
         $this->overwriteEmailReceiver($typoScript, $email);
         $this->overwriteEmailSender($typoScript, $email);
         $this->setSubject($typoScript, $email);
@@ -91,9 +93,9 @@ public function send(
      * @param string $template Template file in Templates/Email/
      * @param array $variables Variables for assignMultiple
      */
-    protected function getMailBody(string $template, array $variables): string
+    protected function getMailBody(string $template, array $variables, RequestInterface|null $request = null): string
     {
-        $standAloneView = TemplateUtility::getDefaultStandAloneView();
+        $standAloneView = TemplateUtility::getDefaultStandAloneView($request);
         $standAloneView->setTemplatePathAndFilename($this->getRelativeEmailPathAndFilename($template));
         $standAloneView->assignMultiple($variables);
         return $standAloneView->render();
@@ -130,9 +132,10 @@ protected function prepareMailObject(
         array $sender,
         string $subject,
         array $variables,
-        MailMessage $email
+        MailMessage $email,
+        RequestInterface|null $request = null
     ): void {
-        $html = $this->getMailBody($template, $variables);
+        $html = $this->getMailBody($template, $variables, $request);
         $email->setTo($receiver)
             ->setFrom($sender)
             ->setSubject($subject)
diff --git a/Classes/Utility/TemplateUtility.php b/Classes/Utility/TemplateUtility.php
index fb38250bf1..8cead51fd9 100644
--- a/Classes/Utility/TemplateUtility.php
+++ b/Classes/Utility/TemplateUtility.php
@@ -5,6 +5,7 @@
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
+use TYPO3\CMS\Extbase\Mvc\RequestInterface;
 use TYPO3\CMS\Fluid\View\StandaloneView;
 
 /**
@@ -111,10 +112,14 @@ public static function getTemplatePaths($pathAndFilename, $part = 'template')
      * @return StandaloneView
      */
     public static function getDefaultStandAloneView(
+        RequestInterface|null $request = null,
         string $format = 'html'
     ) {
         /** @var StandaloneView $standAloneView */
         $standAloneView = GeneralUtility::makeInstance(StandaloneView::class);
+        if ($request instanceof RequestInterface) {
+            $standAloneView->setRequest($request);
+        }
         $standAloneView->setFormat($format);
         $standAloneView->setLayoutRootPaths(TemplateUtility::getTemplateFolders('layout'));
         $standAloneView->setPartialRootPaths(TemplateUtility::getTemplateFolders('partial'));
diff --git a/Resources/Private/Partials/Mail/UserProperties.html b/Resources/Private/Partials/Mail/UserProperties.html
index f44b78ae21..632dbbac6f 100644
--- a/Resources/Private/Partials/Mail/UserProperties.html
+++ b/Resources/Private/Partials/Mail/UserProperties.html
@@ -1,7 +1,7 @@
 <table border="1" cellpadding="2" cellspacing="2">
 	<f:if condition="{user.username}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.username" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.username" /></td>
 			<td>
 				{user.username}
 			</td>
@@ -9,7 +9,7 @@
 	</f:if>
 	<f:if condition="{user.email}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.email" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.email" /></td>
 			<td>
 				{user.email}
 			</td>
@@ -17,7 +17,7 @@
 	</f:if>
 	<f:if condition="{user.www}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.www" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.www" /></td>
 			<td>
 				{user.www}
 			</td>
@@ -25,7 +25,7 @@
 	</f:if>
 	<f:if condition="{user.title}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.title" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.title" /></td>
 			<td>
 				{user.title}
 			</td>
@@ -33,7 +33,7 @@
 	</f:if>
 	<f:if condition="{user.firstName}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.firstName" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.firstName" /></td>
 			<td>
 				{user.firstName}
 			</td>
@@ -41,7 +41,7 @@
 	</f:if>
 	<f:if condition="{user.middleName}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.middleName" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.middleName" /></td>
 			<td>
 				{user.middleName}
 			</td>
@@ -49,7 +49,7 @@
 	</f:if>
 	<f:if condition="{user.lastName}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.lastName" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.lastName" /></td>
 			<td>
 				{user.lastName}
 			</td>
@@ -57,7 +57,7 @@
 	</f:if>
 	<f:if condition="{user.name}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.name" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.name" /></td>
 			<td>
 				{user.name}
 			</td>
@@ -65,29 +65,29 @@
 	</f:if>
 	<f:if condition="{user.company}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.company" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.company" /></td>
 			<td>
 				{user.company}
 			</td>
 		</tr>
 	</f:if>
 	<tr>
-		<td><f:translate key="tx_femanager_domain_model_user.gender" /></td>
+		<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.gender" /></td>
 		<td>
-			<f:translate key="tx_femanager_domain_model_user.gender.item{user.gender}" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.gender.item{user.gender}" />
 		</td>
 	</tr>
 	<f:if condition="{user.dateOfBirth}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.dateOfBirth" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.dateOfBirth" /></td>
 			<td>
-				<f:format.date format="{f:translate(key:'tx_femanager_domain_model_user.dateFormat')}">{user.dateOfBirth}</f:format.date>
+				<f:format.date format="{f:translate(key:'LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.dateFormat')}">{user.dateOfBirth}</f:format.date>
 			</td>
 		</tr>
 	</f:if>
 	<f:if condition="{user.telephone}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.telephone" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.telephone" /></td>
 			<td>
 				{user.telephone}
 			</td>
@@ -95,7 +95,7 @@
 	</f:if>
 	<f:if condition="{user.fax}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.fax" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.fax" /></td>
 			<td>
 				{user.fax}
 			</td>
@@ -103,7 +103,7 @@
 	</f:if>
 	<f:if condition="{user.address}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.address" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.address" /></td>
 			<td>
 				{user.address}
 			</td>
@@ -111,7 +111,7 @@
 	</f:if>
 	<f:if condition="{user.zip}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.zip" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.zip" /></td>
 			<td>
 				{user.zip}
 			</td>
@@ -119,7 +119,7 @@
 	</f:if>
 	<f:if condition="{user.city}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.city" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.city" /></td>
 			<td>
 				{user.city}
 			</td>
@@ -127,7 +127,7 @@
 	</f:if>
 	<f:if condition="{user.country}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.country" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.country" /></td>
 			<td>
 				{user.country}
 			</td>
@@ -135,7 +135,7 @@
 	</f:if>
 	<f:if condition="{user.state}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.state" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.state" /></td>
 			<td>
 				<!-- // TODO: Check me if i was displayed -->
 				{user.state}
@@ -144,7 +144,7 @@
 	</f:if>
 	<f:if condition="{user.image}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.image" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.image" /></td>
 			<td>
 				<f:if condition="{embedImages.0}">
 					<img src="{embedImages.0}" alt="Error in User Image">
@@ -154,7 +154,7 @@
 	</f:if>
 	<f:if condition="{user.usergroup}">
 		<tr>
-			<td><f:translate key="tx_femanager_domain_model_user.usergroup" /></td>
+			<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.usergroup" /></td>
 			<td>
 				<f:for each="{user.usergroup}" as="usergroup" iteration="i">{usergroup.title}<f:if condition="{i.isLast}"><f:else>, </f:else></f:if></f:for>
 			</td>
diff --git a/Resources/Private/Templates/Email/CreateAdminConfirmation.html b/Resources/Private/Templates/Email/CreateAdminConfirmation.html
index f68bb4ff0f..cd6d5f14ce 100644
--- a/Resources/Private/Templates/Email/CreateAdminConfirmation.html
+++ b/Resources/Private/Templates/Email/CreateAdminConfirmation.html
@@ -10,34 +10,34 @@
 		{hash} Hash to ensure authentication of link
 
 <f:section name="main">
-	<p><f:translate key="emailCreateAdminConfirmationSalutation" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationSalutation" /></p>
 
-	<p><f:translate key="emailCreateAdminConfirmationUserProperties" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationUserProperties" /></p>
 	<f:render partial="Mail/UserProperties" arguments="{_all}" />
 
 	<p>
 		<f:format.printf arguments="{0:user.username}">
-			<f:translate key="emailCreateAdminConfirmationText1" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationText1" />
 		</f:format.printf>
 		<br>
 		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'adminConfirmation'}">
-			<f:translate key="emailCreateAdminConfirmationLinkConfirm" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationLinkConfirm" />
 		</f:link.action>
 	</p>
 
 	<p>
-		<f:translate key="emailCreateAdminConfirmationText2" />
+		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationText2" />
 		<br>
 		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'adminConfirmationRefused'}">
-			<f:translate key="emailCreateAdminConfirmationLinkConfirmRefused" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationLinkConfirmRefused" />
 		</f:link.action>
 	</p>
 
 	<p>
-		<f:translate key="emailCreateAdminConfirmationText3" />
+		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationText3" />
 		<br>
 		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'adminConfirmationRefusedSilent'}">
-			<f:translate key="emailCreateAdminConfirmationLinkConfirmRefusedSilent" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationLinkConfirmRefusedSilent" />
 		</f:link.action>
 	</p>
 </f:section>
diff --git a/Resources/Private/Templates/Email/CreateNotify.html b/Resources/Private/Templates/Email/CreateNotify.html
index 0c4fa0e672..1841df735f 100644
--- a/Resources/Private/Templates/Email/CreateNotify.html
+++ b/Resources/Private/Templates/Email/CreateNotify.html
@@ -10,30 +10,30 @@
 		{settings} Array with Flexform and TypoScript settings
 
 <f:section name="main">
-	<p><f:translate key="emailCreateNotifySalutation" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateNotifySalutation" /></p>
 
 	<p>
 		<f:format.printf arguments="{0:user.username}">
-			<f:translate key="emailCreateNotifyText1" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateNotifyText1" />
 		</f:format.printf>
 	</p>
 
-	<p><f:translate key="emailCreateNotifyUserProperties" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateNotifyUserProperties" /></p>
 	<f:render partial="Mail/UserProperties" arguments="{_all}" />
 
 	<p>
-		<f:translate key="emailCreateAdminConfirmationText2" />
+		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationText2" />
 		<br>
 		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'adminConfirmationRefused'}">
-			<f:translate key="emailCreateAdminConfirmationLinkConfirmRefused" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationLinkConfirmRefused" />
 		</f:link.action>
 	</p>
 
 	<p>
-		<f:translate key="emailCreateAdminConfirmationText3" />
+		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationText3" />
 		<br>
 		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'adminConfirmationRefusedSilent'}">
-			<f:translate key="emailCreateAdminConfirmationLinkConfirmRefusedSilent" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateAdminConfirmationLinkConfirmRefusedSilent" />
 		</f:link.action>
 	</p>
 </f:section>
diff --git a/Resources/Private/Templates/Email/CreateUserConfirmation.html b/Resources/Private/Templates/Email/CreateUserConfirmation.html
index a40de23204..d736940c3c 100644
--- a/Resources/Private/Templates/Email/CreateUserConfirmation.html
+++ b/Resources/Private/Templates/Email/CreateUserConfirmation.html
@@ -10,23 +10,23 @@
 		{hash} Hash to ensure authentication of link
 
 <f:section name="main">
-	<p><f:translate key="emailCreateUserConfirmationSalutation" /> {user.username},</p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:mailCreateUserConfirmationSalutation" /> {user.username},</p>
 
 	<p>
-		<f:translate key="emailCreateUserConfirmationText1" />
+		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateUserConfirmationText1" />
 		<br>
 		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'userConfirmation'}">
-			<f:translate key="emailCreateUserConfirmationLinkConfirm" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateUserConfirmationLinkConfirm" />
 		</f:link.action>
 	</p>
 
 	<p>
-		<f:translate key="emailCreateUserConfirmationText2" />
+		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateUserConfirmationText2" />
 		<br>
 		<f:link.action action="confirmCreateRequest" controller="New" absolute="1" arguments="{user:user, hash:hash, status:'userConfirmationRefused'}">
-			<f:translate key="emailCreateUserConfirmationLinkConfirmRefused" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateUserConfirmationLinkConfirmRefused" />
 		</f:link.action>
 	</p>
 
-	<p><f:translate key="emailCreateUserConfirmationSignature" /></p>
-</f:section>
\ No newline at end of file
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateUserConfirmationSignature" /></p>
+</f:section>
diff --git a/Resources/Private/Templates/Email/CreateUserNotifyRefused.html b/Resources/Private/Templates/Email/CreateUserNotifyRefused.html
index 79b9d62612..08c26a99a5 100644
--- a/Resources/Private/Templates/Email/CreateUserNotifyRefused.html
+++ b/Resources/Private/Templates/Email/CreateUserNotifyRefused.html
@@ -9,9 +9,9 @@
 		{user} User Object
 
 <f:section name="main">
-	<p><f:translate key="emailCreateUserNotifyRefusedSalutation" /> {user.username},</p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateUserNotifyRefusedSalutation" /> {user.username},</p>
 
-	<p><f:translate key="emailCreateUserNotifyRefusedText1" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateUserNotifyRefusedText1" /></p>
 
-	<p><f:translate key="emailCreateUserNotifyRefusedSignature" /></p>
-</f:section>
\ No newline at end of file
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateUserNotifyRefusedSignature" /></p>
+</f:section>
diff --git a/Resources/Private/Templates/Email/Invitation.html b/Resources/Private/Templates/Email/Invitation.html
index c1f73892db..47376e2b49 100644
--- a/Resources/Private/Templates/Email/Invitation.html
+++ b/Resources/Private/Templates/Email/Invitation.html
@@ -10,25 +10,25 @@
 		{hash} Hash to ensure authentication of link
 
 <f:section name="main">
-	<p><f:translate key="emailInvitationSalutation" /> {user.username},</p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailInvitationSalutation" /> {user.username},</p>
 
-	<p><f:translate key="emailInvitationText1" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailInvitationText1" /></p>
 
 	<p>
-		<f:translate key="emailInvitationText2" />
+		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailInvitationText2" />
 		<br>
 		<f:link.action action="edit" controller="Invitation" absolute="1" arguments="{user:user, hash:hash}">
-			<f:translate key="emailInvitationLinkConfirm" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailInvitationLinkConfirm" />
 		</f:link.action>
 	</p>
 
 	<p>
-		<f:translate key="emailInvitationText3" />
+		<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailInvitationText3" />
 		<br>
 		<f:link.action action="delete" controller="Invitation" absolute="1" arguments="{user:user, hash:hash}">
-			<f:translate key="emailInvitationLinkConfirmRefused" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailInvitationLinkConfirmRefused" />
 		</f:link.action>
 	</p>
 
-	<p><f:translate key="emailCreateUserConfirmationSignature" /></p>
-</f:section>
\ No newline at end of file
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateUserConfirmationSignature" /></p>
+</f:section>
diff --git a/Resources/Private/Templates/Email/InvitationNotify.html b/Resources/Private/Templates/Email/InvitationNotify.html
index c7f335e619..154f3f641e 100644
--- a/Resources/Private/Templates/Email/InvitationNotify.html
+++ b/Resources/Private/Templates/Email/InvitationNotify.html
@@ -10,14 +10,14 @@
 		{settings} Array with Flexform and TypoScript settings
 
 <f:section name="main">
-	<p><f:translate key="emailCreateNotifySalutation" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateNotifySalutation" /></p>
 
 	<p>
 		<f:format.printf arguments="{0:user.username}">
-			<f:translate key="emailCreateNotifyText2" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateNotifyText2" />
 		</f:format.printf>
 	</p>
 
-	<p><f:translate key="emailCreateNotifyUserProperties" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateNotifyUserProperties" /></p>
 	<f:render partial="Mail/UserProperties" arguments="{_all}" />
 </f:section>
diff --git a/Resources/Private/Templates/Email/InvitationNotifyStep1.html b/Resources/Private/Templates/Email/InvitationNotifyStep1.html
index 5b473bc6ea..49c333ba75 100644
--- a/Resources/Private/Templates/Email/InvitationNotifyStep1.html
+++ b/Resources/Private/Templates/Email/InvitationNotifyStep1.html
@@ -10,14 +10,14 @@
 		{settings} Array with Flexform and TypoScript settings
 
 <f:section name="main">
-	<p><f:translate key="emailCreateNotifySalutation" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateNotifySalutation" /></p>
 
 	<p>
 		<f:format.printf arguments="{0:user.username}">
-			<f:translate key="emailCreateNotifyText1" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateNotifyText1" />
 		</f:format.printf>
 	</p>
 
-	<p><f:translate key="emailCreateNotifyUserProperties" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailCreateNotifyUserProperties" /></p>
 	<f:render partial="Mail/UserProperties" arguments="{_all}" />
 </f:section>
diff --git a/Resources/Private/Templates/Email/InvitationRefused.html b/Resources/Private/Templates/Email/InvitationRefused.html
index c78acfdb06..feef7462f4 100644
--- a/Resources/Private/Templates/Email/InvitationRefused.html
+++ b/Resources/Private/Templates/Email/InvitationRefused.html
@@ -10,14 +10,14 @@
 		{settings} Array with Flexform and TypoScript settings
 
 <f:section name="main">
-	<p><f:translate key="emailInvitationUserRefusedAdminNotifiySalutation" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailInvitationUserRefusedAdminNotifiySalutation" /></p>
 
 	<p>
 		<f:format.printf arguments="{0:user.username}">
-			<f:translate key="emailInvitationUserRefusedAdminNotifiyText2" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailInvitationUserRefusedAdminNotifiyText2" />
 		</f:format.printf>
 	</p>
 
-	<p><f:translate key="emailInvitationUserRefusedAdminNotifiyUserProperties" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailInvitationUserRefusedAdminNotifiyUserProperties" /></p>
 	<f:render partial="Mail/UserProperties" arguments="{_all}" />
 </f:section>
diff --git a/Resources/Private/Templates/Email/UpdateNotify.html b/Resources/Private/Templates/Email/UpdateNotify.html
index dc7b4a8efa..3ea6a76829 100644
--- a/Resources/Private/Templates/Email/UpdateNotify.html
+++ b/Resources/Private/Templates/Email/UpdateNotify.html
@@ -11,23 +11,23 @@
 		{settings} Array with Flexform and TypoScript settings
 
 <f:section name="main">
-	<p><f:translate key="emailUpdateNotifySalutation" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateNotifySalutation" /></p>
 
 	<p>
 		<f:format.printf arguments="{0:user.username}">
-			<f:translate key="emailUpdateNotifyText1" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateNotifyText1" />
 		</f:format.printf>
 	</p>
 
 	<table border="1" cellpadding="2" cellspacing="2">
 		<tr>
-			<td><b><f:translate key="emailUpdateNotifyField" /></b></td>
-			<td><b><f:translate key="emailUpdateNotifyOld" /></b></td>
-			<td><b><f:translate key="emailUpdateNotifyNew" /></b></td>
+			<td><b><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateNotifyField" /></b></td>
+			<td><b><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateNotifyOld" /></b></td>
+			<td><b><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateNotifyNew" /></b></td>
 		</tr>
 		<f:for each="{changes}" as="change" key="property">
 			<tr>
-				<td><f:translate key="tx_femanager_domain_model_user.{property}" /></td>
+				<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.{property}" /></td>
 				<td>
 					<f:if condition="{0:property} == {0:'password'}">
 						<f:else>
@@ -35,12 +35,12 @@
 								<f:then>
 									<f:if condition="{0:property} == {0:'gender'}">
 										<f:then>
-											<f:translate key="tx_femanager_domain_model_user.gender.item{change.old}" />
+											<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.gender.item{change.old}" />
 										</f:then>
 										<f:else>
 											<f:if condition="{0:property} == {0:'dateOfBirth'}">
 												<f:then>
-													<f:format.date format="{f:translate(key:'tx_femanager_domain_model_user.dateFormat')}">{change.old}</f:format.date>
+													<f:format.date format="{f:translate(key:'LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.dateFormat')}">{change.old}</f:format.date>
 												</f:then>
 												<f:else>
 													{change.old}
@@ -50,7 +50,7 @@
 									</f:if>
 								</f:then>
 								<f:else>
-									[<f:translate key="empty" />]
+									[<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:empty" />]
 								</f:else>
 							</f:if>
 						</f:else>
@@ -64,12 +64,12 @@
 						<f:else>
 							<f:if condition="{0:property} == {0:'gender'}">
 								<f:then>
-									<f:translate key="tx_femanager_domain_model_user.gender.item{change.new}" />
+									<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.gender.item{change.new}" />
 								</f:then>
 								<f:else>
 									<f:if condition="{0:property} == {0:'dateOfBirth'}">
 										<f:then>
-											<f:format.date format="{f:translate(key:'tx_femanager_domain_model_user.dateFormat')}">{change.new}</f:format.date>
+											<f:format.date format="{f:translate(key:'LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.dateFormat')}">{change.new}</f:format.date>
 										</f:then>
 										<f:else>
 											{change.new}
diff --git a/Resources/Private/Templates/Email/UpdateRequest.html b/Resources/Private/Templates/Email/UpdateRequest.html
index 37b54b229e..1e6d761e7c 100644
--- a/Resources/Private/Templates/Email/UpdateRequest.html
+++ b/Resources/Private/Templates/Email/UpdateRequest.html
@@ -11,25 +11,25 @@
 		{hash} Hash to ensure authentication of link
 
 <f:section name="main">
-	<p><f:translate key="emailUpdateRequestSalutation" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestSalutation" /></p>
 
 	<p>
 		<f:format.printf arguments="{0:user.username}">
-			<f:translate key="emailUpdateRequestText1" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestText1" />
 		</f:format.printf>
 	</p>
 
-	<p><f:translate key="emailUpdateRequestText2" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestText2" /></p>
 
 	<table border="1" cellpadding="2" cellspacing="2">
 		<tr>
-			<td><b><f:translate key="emailUpdateRequestField" /></b></td>
-			<td><b><f:translate key="emailUpdateRequestOld" /></b></td>
-			<td><b><f:translate key="emailUpdateRequestNew" /></b></td>
+			<td><b><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestField" /></b></td>
+			<td><b><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestOld" /></b></td>
+			<td><b><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestNew" /></b></td>
 		</tr>
 		<f:for each="{changes}" as="change" key="property">
 			<tr>
-				<td><f:translate key="tx_femanager_domain_model_user.{property}" /></td>
+				<td><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.{property}" /></td>
 				<td>
 					<f:if condition="{0:property} == {0:'password'}">
 						<f:else>
@@ -37,12 +37,12 @@
 								<f:then>
 									<f:if condition="{0:property} == {0:'gender'}">
 										<f:then>
-											<f:translate key="tx_femanager_domain_model_user.gender.item{change.old}" />
+											<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.gender.item{change.old}" />
 										</f:then>
 										<f:else>
 											<f:if condition="{0:property} == {0:'dateOfBirth'}">
 												<f:then>
-													<f:format.date format="{f:translate(key:'tx_femanager_domain_model_user.dateFormat')}">{change.old}</f:format.date>
+													<f:format.date format="{f:translate(key:'LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.dateFormat')}">{change.old}</f:format.date>
 												</f:then>
 												<f:else>
 													{change.old}
@@ -52,7 +52,7 @@
 									</f:if>
 								</f:then>
 								<f:else>
-									[<f:translate key="empty" />]
+									[<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:empty" />]
 								</f:else>
 							</f:if>
 						</f:else>
@@ -66,12 +66,12 @@
 						<f:else>
 							<f:if condition="{0:property} == {0:'gender'}">
 								<f:then>
-									<f:translate key="tx_femanager_domain_model_user.gender.item{change.new}" />
+									<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.gender.item{change.new}" />
 								</f:then>
 								<f:else>
 									<f:if condition="{0:property} == {0:'dateOfBirth'}">
 										<f:then>
-											<f:format.date format="{f:translate(key:'tx_femanager_domain_model_user.dateFormat')}">{change.new}</f:format.date>
+											<f:format.date format="{f:translate(key:'LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:tx_femanager_domain_model_user.dateFormat')}">{change.new}</f:format.date>
 										</f:then>
 										<f:else>
 											{change.new}
@@ -92,17 +92,17 @@
 	<ul>
 		<li>
 			<f:link.action action="confirmUpdateRequest" controller="Edit" absolute="1" arguments="{user:user, hash:hash}">
-				<f:translate key="emailUpdateRequestLinkConfirm" />
+				<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestLinkConfirm" />
 			</f:link.action>
 		</li>
 		<li>
 			<f:link.action action="confirmUpdateRequest" controller="Edit" absolute="1" arguments="{user:user, hash:hash, status:'refuse'}">
-				<f:translate key="emailUpdateRequestLinkRefuse" />
+				<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestLinkRefuse" />
 			</f:link.action>
 		</li>
 		<li>
 			<f:link.action action="confirmUpdateRequest" controller="Edit" absolute="1" arguments="{user:user, hash:hash, status:'silentRefuse'}">
-				<f:translate key="emailUpdateRequestLinkSiltentRefuse" />
+				<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestLinkSiltentRefuse" />
 			</f:link.action>
 		</li>
 	</ul>
diff --git a/Resources/Private/Templates/Email/UpdateRequestRefused.html b/Resources/Private/Templates/Email/UpdateRequestRefused.html
index bd7a1acd2d..4b2335cdbb 100644
--- a/Resources/Private/Templates/Email/UpdateRequestRefused.html
+++ b/Resources/Private/Templates/Email/UpdateRequestRefused.html
@@ -9,16 +9,16 @@
 		{user} User Object
 
 <f:section name="main">
-	<p><f:translate key="emailUpdateRequestRefusedSalutation" /> {user.username},</p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestRefusedSalutation" /> {user.username},</p>
 
-	<p><f:translate key="emailUpdateRequestRefusedText1" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestRefusedText1" /></p>
 
 	<p>
 		<f:format.printf arguments="{0:settings.edit.email.updateRequestRefused.sender.email.value}">
-			<f:translate key="emailUpdateRequestRefusedText2" />
+			<f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestRefusedText2" />
 		</f:format.printf>
 	</p>
 
-	<p><f:translate key="emailUpdateRequestRefusedSignature" /></p>
+	<p><f:translate key="LLL:EXT:femanager/Resources/Private/Language/locallang.xlf:emailUpdateRequestRefusedSignature" /></p>
 
 </f:section>