diff --git a/themes/fid/scss/_customVariables.scss b/themes/fid/scss/_customVariables.scss
index 793c90eb273256fba554e40c7042e920b055291f..37d0cf219a0fc76d7eee4ff32a4343e70bd8c304 100644
--- a/themes/fid/scss/_customVariables.scss
+++ b/themes/fid/scss/_customVariables.scss
@@ -7,4 +7,4 @@ $margin-right-width: 5px;
 $content-left-padding: $grid-gutter-width;
 $content-right-padding: $grid-gutter-width;
 $button-left-margin: $margin-left-width;
-$button-right-margin: $margin-right-width;
+$button-right-margin: $margin-right-width;
\ No newline at end of file
diff --git a/themes/fid/scss/compiled.scss b/themes/fid/scss/compiled.scss
index 43d14ac7f5f6fa8c3ae9e31f53b956200aa5fbc6..007403874441d35eb7d691f85fc7497e4737c7e3 100644
--- a/themes/fid/scss/compiled.scss
+++ b/themes/fid/scss/compiled.scss
@@ -40,7 +40,13 @@
 form input:focus:required:invalid {
   box-shadow: 0 0 2px 1px rgba(255,0,0,0.9);
 }
-//
-//form input:invalid {
-//  box-shadow: none;
-//}
\ No newline at end of file
+
+.registration {
+  input[type="checkbox"] {
+    display: inline-flex;
+    margin-right: $margin-right-width;
+    padding-left: $margin-right-width;
+  }
+}
+
+
diff --git a/themes/fid/templates/fid/user/create.phtml b/themes/fid/templates/fid/user/create.phtml
index 64be7935051af5577b89033652ef8dae309fafb0..311209527653764865eefc0a061fb42b1fca95fa 100644
--- a/themes/fid/templates/fid/user/create.phtml
+++ b/themes/fid/templates/fid/user/create.phtml
@@ -57,7 +57,7 @@ $formElementErrors->setTranslator($translator);
 $form = $this->form;
 $form->setAttribute('method', 'post');
 $form->setAttribute('action', $this->url('fid/user/create'));
-$form->setAttribute('class', 'form-horizontal');
+$form->setAttribute('class', 'form-horizontal registration');
 $form->prepare();
 
 $this->headTitle($this->translate('Profile Form'));
@@ -65,6 +65,11 @@ $this->headTitle($this->translate("fid::user_create_form_title"));
 ?>
 
 <h2><?= $this->translate("fid::user_create_form_title") ?></h2>
+
+<div class="subito-pg">
+    * <?=$this->transEsc("This field is required")?>
+</div>
+
 <?= $this->flashmessages() ?>
 <?= $this->form()->openTag($form) ?>
 <br/>
@@ -220,22 +225,22 @@ $elemJobTitle->setAttributes(['class' => 'form-control']);
 <?php
 /** @var Checkbox $elemEulaAccepted */
 $elemEulaAccepted = $form->get('eulaAccepted');
+$elemEulaAccepted->setAttribute('id', $elemEulaAccepted->getAttribute('name') ?? 'eulaAccepted');
 $elemEulaAccepted->setAttributes(['class' => 'inline']);
 $elemEulaAccepted->setLabelAttributes(['class' => 'inline']);
 ?>
-<div class="form-group">
+<br />
+<div class="no-margin-l">
     <?= $this->formElement($elemEulaAccepted) ?>
     <?= $this->formLabel()->openTag($elemEulaAccepted) ?>
     <?= $this->translate("fid::policy_text") ?>
-    <? $url = $this->url('fid/user/policy') ?>
-    <a data-lightbox href="<?= $url ?>">
+    <?php $url = $this->url('fid/user/policy') ?>
+    <a target="_blank" href="<?= $url ?>">
         <?= $this->translate("fid::policy") ?>
     </a>
     <?= $this->translate("fid::terms_text") ?>
-    <? $url = $this->url('fid/user/terms') ?>
-    <a data-lightbox href="<?= $url ?>">
-        <?= $this->translate("fid::terms") ?>
-    </a>.
+    <?php $url = $this->url('fid/user/terms') ?>
+    <a target="_blank" href="<?= $url ?>"><?= $this->translate("fid::terms") ?>.</a>
     <?= $this->formLabel()->closeTag($elemEulaAccepted) ?>
     <?= $this->formElementErrors($elemEulaAccepted) ?>
 </div>
diff --git a/themes/fid/templates/fid/user/init.phtml b/themes/fid/templates/fid/user/init.phtml
index 00b634df289576e33cb62c1a41a43225f5adbdd4..1cc338a268597b471101d233dbdfd6e3286cb638 100644
--- a/themes/fid/templates/fid/user/init.phtml
+++ b/themes/fid/templates/fid/user/init.phtml
@@ -47,12 +47,18 @@ $formElementErrors->setTranslator($translator);
 $form = $this->form;
 $form->setAttribute('method', 'post');
 $form->setAttribute('action', $this->url('fid/user/init'));
+$form->setAttribute('class', 'registration');
 $form->prepare();
 
 $this->headTitle($this->translate("fid::user_init_form_title"));
 ?>
 
 <h2><?= $this->translate("fid::user_init_form_title") ?></h2>
+
+<div class="subito-pg">
+    * <?=$this->transEsc("This field is required")?>
+</div>
+
 <?= $this->flashmessages() ?>
 <?= $this->form()->openTag($form) ?>
 <br/>
@@ -112,18 +118,19 @@ $elemLastname->setAttributes(['class' => 'form-control']);
 <?php
 /** @var Element\Checkbox $elemEulaAccepted */
 $elemEulaAccepted = $form->get('eulaAccepted');
+$elemEulaAccepted->setAttribute('id', $elemEulaAccepted->getAttribute('name') ?? 'eulaAccepted');
 ?>
 <div class="form-group">
     <?= $this->formElement($elemEulaAccepted) ?>
     <?= $this->formLabel()->openTag($elemEulaAccepted) ?>
     <?= $this->translate("fid::policy_text") ?>
     <? $url = $this->url('fid/user/policy') ?>
-    <a data-lightbox href="<?= $url ?>">
+    <a target="_blank" href="<?= $url ?>">
         <?= $this->translate("fid::policy") ?>
     </a>
     <?= $this->translate("fid::terms_text") ?>
     <? $url = $this->url('fid/user/terms') ?>
-    <a data-lightbox href="<?= $url ?>">
+    <a target="_blank" href="<?= $url ?>">
         <?= $this->translate("fid::terms") ?></a>.
     <?= $this->formLabel()->closeTag($elemEulaAccepted) ?>
     <?= $this->formElementErrors($elemEulaAccepted) ?>
diff --git a/themes/fid/templates/fid/user/policy-de.phtml b/themes/fid/templates/fid/user/policy-de.phtml
index 42bd73758a7e342b0f2f765c12dc8bca50040a22..db180bbe743aa5719f97e6d913a30a60934e2100 100644
--- a/themes/fid/templates/fid/user/policy-de.phtml
+++ b/themes/fid/templates/fid/user/policy-de.phtml
@@ -1,5 +1,4 @@
-<div class="adlr-policies">
-  <br />
+<div class="fid-policies">
   <h2><strong>Datenschutzerkl&auml;rung</strong></h2>
   <ol>
     <li><strong>Name und Anschrift des Verantwortlichen</strong></li>
diff --git a/themes/fid/templates/fid/user/policy-en.phtml b/themes/fid/templates/fid/user/policy-en.phtml
index 7869bf7c7669fb58468c53b1786367d65a3c43dd..62ad2fc2499ac05afd0828c4a860b7586c5fb41f 100644
--- a/themes/fid/templates/fid/user/policy-en.phtml
+++ b/themes/fid/templates/fid/user/policy-en.phtml
@@ -1,5 +1,4 @@
-<div class="adlr-policies">
-  <br />
+<div class="fid-policies">
   <h2><strong>Privacy Policy</strong></h2>
   <p>Please note: The English version of our privacy policy is for informational purposes only. The
     German version shall be legally binding only.</p>
diff --git a/themes/fid/templates/fid/user/policy.phtml b/themes/fid/templates/fid/user/policy.phtml
index 806aedc38d6ad5b3cae080c98e66eb43ce471467..bb3e1fb5ed4bb095daa2c8afe6a1cc72e21f27fe 100644
--- a/themes/fid/templates/fid/user/policy.phtml
+++ b/themes/fid/templates/fid/user/policy.phtml
@@ -1,9 +1,25 @@
 <!-- fid - policy begin -->
 <? $lang = $this->layout()->userLang; ?>
+<?php if ($this->layout()->getTemplate() == 'layout/lightbox'): ?>
+    <div class="form-group">
+        <a class="back-to-login btn btn-link" href="<?=$this->url('myresearch-account') ?>">
+            <i class="fa fa-chevron-left" aria-hidden="true"></i>
+            <?=$this->transEsc('Back')?>
+        </a>
+    </div>
+<? endif; ?>
 <? $fileExists = file_exists(dirname(__FILE__) . '/policy-'.$lang.'.phtml'); ?>
 <? if ($fileExists): ?>
     <?=$this->render('fid/user/policy-'.$lang.'.phtml')?>
 <? else: ?>
     <?=$this->render('fid/user/policy-en.phtml')?>
 <? endif; ?>
+<?php if ($this->layout()->getTemplate() == 'layout/lightbox'): ?>
+    <div class="form-group">
+        <a class="back-to-login btn btn-link" href="<?=$this->url('myresearch-account') ?>">
+            <i class="fa fa-chevron-left" aria-hidden="true"></i>
+            <?=$this->transEsc('Back')?>
+        </a>
+    </div>
+<? endif; ?>
 <!-- fid - policy end -->
diff --git a/themes/fid/templates/fid/user/terms-de.phtml b/themes/fid/templates/fid/user/terms-de.phtml
index 1959fb6dcda91cb33412c6074e3b12a8c63fd456..be888e3c75076ac11a30b24526e86d903e4b1511 100644
--- a/themes/fid/templates/fid/user/terms-de.phtml
+++ b/themes/fid/templates/fid/user/terms-de.phtml
@@ -1,5 +1,4 @@
-<div class="adlr-policies">
-<br />
+<div class="fid-policies">
 <p><i>adlr.link</i>, der Fachinformationsdienst f&uuml;r Medien- und Kommunikationswissenschaften wird von der Universit&auml;tsbibliothek Leipzig betrieben und von der Deutschen Forschungsgemeinschaft (DFG) gef&ouml;rdert.</p>
 <p>Der Dienst richtet sich entsprechend den Förderrichtlinien der DFG vorrangig an WissenschaftlerInnen der Kommunikations-, Medien- und Filmwissenschaften sowie angrenzender Fachgebiete in Deutschland für den schnellen und direkten Zugriff auf Spezialliteratur und forschungsrelevante Informationen unabhängig vom Standort der Tätigkeit.</p>
 <p>Mit der Nutzung der Dienste von <i>adlr.link</i> erkl&auml;ren Sie sich mit den Nutzungsbedingungen und der Datenschutzerkl&auml;rung einverstanden.</p>
diff --git a/themes/fid/templates/fid/user/terms-en.phtml b/themes/fid/templates/fid/user/terms-en.phtml
index ad8f39a759b4e1da4a6d046f8c8f1b52f296b32f..4e707ed2509be22244f02710e7513d539ee582f3 100644
--- a/themes/fid/templates/fid/user/terms-en.phtml
+++ b/themes/fid/templates/fid/user/terms-en.phtml
@@ -1,5 +1,4 @@
-<div class="adlr-policies">
-<br />
+<div class="fid-policies">
 <p><i>adlr.link</i> is operated by Leipzig University Library and funded by the Deutsche Forschungsgemeinschaft (DFG).</p>
 <p>According to DFG funding guidelines, the service is primarily aimed at academics in the communication, media and film studies as well as related fields of study in Germany for immediate and direct access to specific literature and research-relevant information.</p>
 <p>By using the services of <i>adlr.link</i>, you agree to our terms of use and privacy policy. Please note: The English version of our terms of use is for informational purposes only. The German version shall be legally binding only.</p>
diff --git a/themes/fid/templates/fid/user/terms.phtml b/themes/fid/templates/fid/user/terms.phtml
index c51cba2bee239b06e6f8ce473e3c917d2e3464f5..25489e365284633040351d5af5d91618a6b74308 100644
--- a/themes/fid/templates/fid/user/terms.phtml
+++ b/themes/fid/templates/fid/user/terms.phtml
@@ -1,9 +1,25 @@
 <!-- fid - terms begin -->
 <? $lang = $this->layout()->userLang; ?>
 <? $fileExists = file_exists(dirname(__FILE__) . '/terms-'.$lang.'.phtml'); ?>
+<?php if ($this->layout()->getTemplate() == 'layout/lightbox'): ?>
+    <div class="form-group">
+        <a class="back-to-login btn btn-link" href="<?=$this->url('myresearch-account') ?>">
+            <i class="fa fa-chevron-left" aria-hidden="true"></i>
+            <?=$this->transEsc('Back')?>
+        </a>
+    </div>
+<? endif; ?>
 <? if ($fileExists): ?>
     <?=$this->render('fid/user/terms-'.$lang.'.phtml')?>
 <? else: ?>
     <?=$this->render('fid/user/terms-en.phtml')?>
 <? endif; ?>
+<?php if ($this->layout()->getTemplate() == 'layout/lightbox'): ?>
+    <div class="form-group">
+        <a class="back-to-login btn btn-link" href="<?=$this->url('myresearch-account') ?>">
+            <i class="fa fa-chevron-left" aria-hidden="true"></i>
+            <?=$this->transEsc('Back')?>
+        </a>
+    </div>
+<? endif; ?>
 <!-- fid - terms end -->