diff --git a/forms/FormField.php b/forms/FormField.php
index 87b73e63c..7608d607e 100644
--- a/forms/FormField.php
+++ b/forms/FormField.php
@@ -360,6 +360,11 @@ class FormField extends RequestHandler {
 			'disabled' => $this->isDisabled(),
 		);
 
+		if ($this->Required()) {
+			$attrs['required'] = 'required';
+			$attrs['aria-required'] = 'true';
+		}
+
 		return array_merge($attrs, $this->attributes);
 	}
 
diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php
index cb584539c..9e6795339 100644
--- a/security/MemberLoginForm.php
+++ b/security/MemberLoginForm.php
@@ -94,6 +94,8 @@ class MemberLoginForm extends LoginForm {
 
 		parent::__construct($controller, $name, $fields, $actions);
 
+		$this->setValidator(new RequiredFields('Email', 'Password'));
+
 		// Focus on the email input when the page is loaded
 		Requirements::customScript(<<<JS
 			(function() {