diff --git a/lib/Controller/RegisterController.php b/lib/Controller/RegisterController.php
index a34c168..deb7e55 100644
--- a/lib/Controller/RegisterController.php
+++ b/lib/Controller/RegisterController.php
@@ -131,7 +131,11 @@ class RegisterController extends Controller {
 				);
 			}
 
-			return new TemplateResponse('registration', 'form', ['email' => $registration->getEmail(), 'token' => $registration->getToken()], 'guest');
+			return new TemplateResponse('registration', 'form', [
+				'email' => $registration->getEmail(),
+				'email_is_login' => $this->config->getAppValue('registration', 'email_is_login', '0') === '1',
+				'token' => $registration->getToken(),
+			], 'guest');
 		} catch (RegistrationException $exception) {
 			return $this->renderError($exception->getMessage(), $exception->getHint());
 		}
@@ -147,7 +151,7 @@ class RegisterController extends Controller {
 	public function createAccount($token) {
 		$registration = $this->registrationService->getRegistrationForToken($token);
 		if ($this->config->getAppValue('registration', 'email_is_login', '0') === '1') {
-			$username = $registration->email;
+			$username = $registration->getEmail();
 		} else {
 			$username = $this->request->getParam('username');
 		}
diff --git a/lib/Db/Registration.php b/lib/Db/Registration.php
index e88b5fa..46dbbb1 100644
--- a/lib/Db/Registration.php
+++ b/lib/Db/Registration.php
@@ -47,7 +47,7 @@ use OCP\AppFramework\Db\Entity;
  */
 class Registration extends Entity {
 	public $id;
-	public $email;
+	protected $email;
 	protected $username;
 	protected $displayname;
 	protected $password;
diff --git a/templates/form.php b/templates/form.php
index 51b21eb..c9e81b0 100644
--- a/templates/form.php
+++ b/templates/form.php
@@ -23,7 +23,7 @@ script('registration', 'form');
 			<img id="email-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/mail.svg')); ?>" alt=""/>
 		</p>
 
-		<?php if ( \OC::$server->getConfig()->getAppValue('registration', 'email_is_login', '0') !== '1' ) { ?>
+		<?php if ($_['email_is_login']) { ?>
 		<p class="groupmiddle">
 			<input type="text" name="username" id="username" value="<?php if (!empty($_['entered_data']['user'])) {
 	p($_['entered_data']['user']);
@@ -31,7 +31,7 @@ script('registration', 'form');
 			<label for="username" class="infield"><?php p($l->t('Username')); ?></label>
 			<img id="username-icon" class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
 		</p>
-        <?php } ?>
+		<?php } ?>
 
 		<p class="groupbottom">
 			<input type="password" name="password" id="password" placeholder="<?php p($l->t('Password')); ?>"/>
diff --git a/tests/Integration/Controller/RegisterControllerTest.php b/tests/Integration/Controller/RegisterControllerTest.php
index 7475f67..b3bb45b 100644
--- a/tests/Integration/Controller/RegisterControllerTest.php
+++ b/tests/Integration/Controller/RegisterControllerTest.php
@@ -108,6 +108,7 @@ class RegisterControllerTest extends TestCase {
 			$this->request,
 			$this->l10n,
 			$this->urlGenerator,
+			$this->config,
 			$this->registrationService,
 			$this->mailService
 		);