diff --git a/apps/files_encryption/templates/invalid_private_key.php b/apps/files_encryption/templates/invalid_private_key.php
index a3cae60b1d..b275b9c428 100644
--- a/apps/files_encryption/templates/invalid_private_key.php
+++ b/apps/files_encryption/templates/invalid_private_key.php
@@ -5,7 +5,7 @@
 		<?php p($_['message']); ?>
 		<br/>
 		<?php if($_['errorCode'] === \OCA\Encryption\Crypt::ENCRYPTION_PRIVATE_KEY_NOT_VALID_ERROR): ?>
-			<?php>p($l->t('Go directly to your ')); ?> <a href="<?php echo $location?>"><?php p($l->t('personal settings')); ?>.</a>
+			<?php p($l->t('Go directly to your %spersonal settings%s.', array('<a href="'.$location.'">', '</a>'))); ?>
 		<?php endif; ?>
 		<br/>
 	</li>
diff --git a/apps/files_encryption/templates/settings-admin.php b/apps/files_encryption/templates/settings-admin.php
index cf676c445c..d4e6abf004 100644
--- a/apps/files_encryption/templates/settings-admin.php
+++ b/apps/files_encryption/templates/settings-admin.php
@@ -34,20 +34,20 @@
 		<input
 			type="password"
 			name="changeRecoveryPassword"
-			id="oldEncryptionRecoveryPassword"
+			id="oldEncryptionRecoveryPassword" />
 		<label for="oldEncryptionRecoveryPassword"><?php p($l->t("Old Recovery key password")); ?></label>
 		<br/>
 		<br/>
 		<input
 			type="password"
 			name="changeRecoveryPassword"
-			id="newEncryptionRecoveryPassword"
+			id="newEncryptionRecoveryPassword" />
 		<label for="newEncryptionRecoveryPassword"><?php p($l->t("New Recovery key password")); ?></label>
 		<br/>
 		<input
 			type="password"
 			name="changeRecoveryPassword"
-			id="repeatedNewEncryptionRecoveryPassword"
+			id="repeatedNewEncryptionRecoveryPassword" />
 		<label for="repeatEncryptionRecoveryPassword"><?php p($l->t("Repeat New Recovery key password")); ?></label>
 		<br/>
 		<button