diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 2f94f942171..a53cd82fcfd 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -37,7 +37,9 @@
 						</div>
 					</header>
 				<?php endif; ?>
-				<?php print_unescaped($_['content']); ?>
+				<main>
+					<?php print_unescaped($_['content']); ?>
+				</main>
 			</div>
 		</div>
 		<footer role="contentinfo">
diff --git a/core/templates/login.php b/core/templates/login.php
index ee1ce6a6870..8fc68edb92d 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -37,6 +37,7 @@ script('core', 'merged-login');
 		<p class="grouptop<?php if (!empty($_['invalidpassword'])) { ?> shake<?php } ?>">
 			<input type="text" name="user" id="user"
 				placeholder="<?php p($l->t('Username or email')); ?>"
+				aria-label="<?php p($l->t('Username or email')); ?>"
 				value="<?php p($_['loginName']); ?>"
 				<?php p($_['user_autofocus'] ? 'autofocus' : ''); ?>
 				autocomplete="on" autocapitalize="none" autocorrect="off" required>
@@ -46,6 +47,7 @@ script('core', 'merged-login');
 		<p class="groupbottom<?php if (!empty($_['invalidpassword'])) { ?> shake<?php } ?>">
 			<input type="password" name="password" id="password" value=""
 				placeholder="<?php p($l->t('Password')); ?>"
+				aria-label="<?php p($l->t('Password')); ?>"
 				<?php p($_['user_autofocus'] ? '' : 'autofocus'); ?>
 				autocomplete="on" autocapitalize="off" autocorrect="none" required>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>