diff --git a/layouts/partials/search.html b/layouts/partials/search.html
index 641a235..5e3cff6 100644
--- a/layouts/partials/search.html
+++ b/layouts/partials/search.html
@@ -10,7 +10,7 @@
 		<meta itemprop="urlTemplate" content="{{ $action }}?q={q}" />
 	</label>
 	<div><!--We need the extra divs to serve as pseudo-table-cells.-->
-		<input itemprop="query-input" id="search" type="search" required="" name="q" />
+		<input itemprop="query-input" id="search" type="search" required="" aria-required="true" autocomplete="on" name="q" />
 		<div><input type="submit" value="search" /></div>
 	</div>
 </form>
diff --git a/layouts/partials/webmention-form.html b/layouts/partials/webmention-form.html
index 73dca75..a0a5ddc 100644
--- a/layouts/partials/webmention-form.html
+++ b/layouts/partials/webmention-form.html
@@ -8,7 +8,7 @@
 		<input type="hidden" name="target" value="{{ .Site.Params.canonicalBaseURL }}{{ $canonicalRelPermalink }}" />
 		<label for="menchie">URL of page linking here</label>
 		<div><!--We need the extra divs to serve as pseudo-table-cells.-->
-			<input id="menchie" type="url" required="" name="source" />
+			<input id="menchie" type="url" autocomplete="off" required="" aria-required="true" name="source" /><!--disable autocomplete bc it's a unique URL.-->
 			<div><input type="submit" value="submit" /></div>
 		</div>
 	</form>