diff --git a/theme/boost/amd/build/aria.min.js b/theme/boost/amd/build/aria.min.js
index 37d107578f3..b823d5c6ed6 100644
--- a/theme/boost/amd/build/aria.min.js
+++ b/theme/boost/amd/build/aria.min.js
@@ -1 +1 @@
-define(["jquery"],function(a){return{init:function(){var b=!1,c=function(){b=!0},d=function(){var a=b;return b=!1,a};a('[data-toggle="dropdown"]').keydown(function(b){var d,e=b.which||b.keyCode;38==e&&c(),27==e&&(d=a(b.target).attr("aria-expanded"),b.preventDefault(),"false"==d&&a(b.target).click()),32!=e&&13!=e||(b.preventDefault(),a(b.target).click())});var e=function(b){var c=function(){a(this).focus()}.bind(b);setTimeout(c,50)};a(".dropdown").on("shown.bs.dropdown",function(b){var c=a(b.target).find('[role="menu"]'),f=!1,g=!1;c&&(f=a(c).find('[role="menuitem"]')),f&&f.length>0&&(g=d()?f[f.length-1]:f[0]),g&&e(g)}),a('.dropdown [role="menu"] [role="menuitem"]').keypress(function(b){var c,d,f=String.fromCharCode(b.which||b.keyCode),g=a(b.target).closest('[role="menu"]'),h=0,i=!1;if(g&&(i=a(g).find('[role="menuitem"]')))for(f=f.toLowerCase(),h=0;h<i.length;h++)if(c=a(i[h]),d=c.text().trim().toLowerCase(),0==d.indexOf(f)){e(c);break}}),a('.dropdown [role="menu"] [role="menuitem"]').keydown(function(b){var c=b.which||b.keyCode,d=!1,f=a(b.target).closest('[role="menu"]'),g=0,h=!1;if(f&&(h=a(f).find('[role="menuitem"]'))){if(40==c){for(g=0;g<h.length-1;g++)if(h[g]==b.target){d=h[g+1];break}d||(d=h[0])}else if(38==c){for(g=1;g<h.length;g++)if(h[g]==b.target){d=h[g-1];break}d||(d=h[h.length-1])}else 36==c?d=h[0]:35==c&&(d=h[h.length-1]);d&&(b.preventDefault(),e(d))}}),a(".dropdown").on("hidden.bs.dropdown",function(b){var c=a(b.target).find('[data-toggle="dropdown"]');c&&e(c)})}}});
\ No newline at end of file
+define(["jquery"],function(a){return{init:function(){var b=!1,c=function(){b=!0},d=function(){var a=b;return b=!1,a};a('[data-toggle="dropdown"]').keydown(function(b){var d,e=b.which||b.keyCode;38==e&&c(),27==e&&(d=a(b.target).attr("aria-expanded"),b.preventDefault(),"false"==d&&a(b.target).click()),32!=e&&13!=e||(b.preventDefault(),a(b.target).click())});var e=function(b){var c=function(){a(this).focus()}.bind(b);setTimeout(c,50)};a(".dropdown").on("shown.bs.dropdown",function(b){var c=a(b.target).find('[role="menu"]'),f=!1,g=!1;c&&(f=a(c).find('[role="menuitem"]')),f&&f.length>0&&(g=d()?f[f.length-1]:f[0]),g&&e(g)}),a('.dropdown [role="menu"] [role="menuitem"]').keypress(function(b){var c,d,f=String.fromCharCode(b.which||b.keyCode),g=a(b.target).closest('[role="menu"]'),h=0,i=!1;if(g&&(i=a(g).find('[role="menuitem"]')))for(f=f.toLowerCase(),h=0;h<i.length;h++)if(c=a(i[h]),d=c.text().trim().toLowerCase(),0==d.indexOf(f)){e(c);break}}),a('.dropdown [role="menu"] [role="menuitem"]').keydown(function(b){var c=b.which||b.keyCode,d=!1,f=a(b.target).closest('[role="menu"]'),g=0,h=!1;if(f&&(h=a(f).find('[role="menuitem"]'))){if(40==c){for(g=0;g<h.length-1;g++)if(h[g]==b.target){d=h[g+1];break}d||(d=h[0])}else if(38==c){for(g=1;g<h.length;g++)if(h[g]==b.target){d=h[g-1];break}d||(d=h[h.length-1])}else 36==c?d=h[0]:35==c&&(d=h[h.length-1]);d&&(b.preventDefault(),e(d))}}),a(".dropdown").on("hidden.bs.dropdown",function(b){var c=a(b.target).find('[data-toggle="dropdown"]');c&&e(c)}),a(function(){window.setTimeout(function(){var b=a('[role="alert"][data-aria-autofocus="true"]');b.length>0&&(a(b[0]).attr("tabindex","0"),a(b[0]).focus())},300)})}}});
\ No newline at end of file
diff --git a/theme/boost/amd/src/aria.js b/theme/boost/amd/src/aria.js
index 0f38c4a990b..aacfba2e5d4 100644
--- a/theme/boost/amd/src/aria.js
+++ b/theme/boost/amd/src/aria.js
@@ -183,6 +183,17 @@ define(['jquery'], function($) {
                     shiftFocus(trigger);
                 }
             });
+
+            // After page load, focus on any element with special autofocus attribute.
+            $(function() {
+                window.setTimeout(function() {
+                    var alerts = $('[role="alert"][data-aria-autofocus="true"]');
+                    if (alerts.length > 0) {
+                        $(alerts[0]).attr('tabindex', '0');
+                        $(alerts[0]).focus();
+                    }
+                }, 300);
+            });
         }
     };
 });
diff --git a/theme/boost/templates/core/auth_verify_age_location_page.mustache b/theme/boost/templates/core/auth_verify_age_location_page.mustache
index 5f5fa057ef7..c462587472b 100644
--- a/theme/boost/templates/core/auth_verify_age_location_page.mustache
+++ b/theme/boost/templates/core/auth_verify_age_location_page.mustache
@@ -40,7 +40,7 @@
                         <hr>
                     </div>
                     {{#error}}
-                        <div class="alert alert-danger" role="alert">
+                        <div class="alert alert-danger" role="alert" data-aria-autofocus="true">
                             {{{error}}}
                         </div>
                     {{/error}}
diff --git a/theme/boost/templates/core/loginform.mustache b/theme/boost/templates/core/loginform.mustache
index 5f410e8f0e9..4f5168ff40e 100644
--- a/theme/boost/templates/core/loginform.mustache
+++ b/theme/boost/templates/core/loginform.mustache
@@ -112,7 +112,7 @@
             {{#error}}
                 <div class="loginerrors mt-3">
                     <a href="#" id="loginerrormessage" class="accesshide">{{error}}</a>
-                    <div class="alert alert-danger" role="alert">{{error}}</div>
+                    <div class="alert alert-danger" role="alert" data-aria-autofocus="true">{{error}}</div>
                 </div>
             {{/error}}
 
diff --git a/theme/boost/templates/core/notification_error.mustache b/theme/boost/templates/core/notification_error.mustache
index 02d87984fee..3d05b42bde7 100644
--- a/theme/boost/templates/core/notification_error.mustache
+++ b/theme/boost/templates/core/notification_error.mustache
@@ -37,7 +37,7 @@
     { "message": "Your pants are on fire!", "closebutton": 1, "announce": 1, "extraclasses": "foo bar"}
 }}
 <div class="alert alert-danger alert-block fade in {{ extraclasses }}" {{!
-    }}{{# announce }} role="alert"{{/ announce }}{{!
+    }}{{# announce }} role="alert" data-aria-autofocus="true"{{/ announce }}{{!
     }}>
     {{# closebutton }}<button type="button" class="close" data-dismiss="alert">&times;</button>{{/ closebutton }}
     {{{ message }}}
diff --git a/theme/boost/templates/core/notification_info.mustache b/theme/boost/templates/core/notification_info.mustache
index bc7393dcc8e..692751f4fa9 100644
--- a/theme/boost/templates/core/notification_info.mustache
+++ b/theme/boost/templates/core/notification_info.mustache
@@ -37,7 +37,7 @@
     { "message": "Your pants are on fire!", "closebutton": 1, "announce": 1, "extraclasses": "foo bar"}
 }}
 <div class="alert alert-info alert-block fade in {{ extraclasses }}" {{!
-    }}{{# announce }} role="alert"{{/ announce }}{{!
+    }}{{# announce }} role="alert" data-aria-autofocus="true"{{/ announce }}{{!
     }}>
     {{# closebutton }}<button type="button" class="close" data-dismiss="alert">&times;</button>{{/ closebutton }}
     {{{ message }}}
diff --git a/theme/boost/templates/core/notification_success.mustache b/theme/boost/templates/core/notification_success.mustache
index 74227e320ef..b33f4aa24aa 100644
--- a/theme/boost/templates/core/notification_success.mustache
+++ b/theme/boost/templates/core/notification_success.mustache
@@ -37,7 +37,7 @@
     { "message": "Your pants are on fire!", "closebutton": 1, "announce": 1, "extraclasses": "foo bar"}
 }}
 <div class="alert alert-success alert-block fade in {{ extraclasses }}" {{!
-    }}{{# announce }} role="alert"{{/ announce }}{{!
+    }}{{# announce }} role="alert" data-aria-autofocus="true"{{/ announce }}{{!
     }}>
     {{# closebutton }}<button type="button" class="close" data-dismiss="alert">&times;</button>{{/ closebutton }}
     {{{ message }}}
diff --git a/theme/boost/templates/core/notification_warning.mustache b/theme/boost/templates/core/notification_warning.mustache
index c0a2f06d81b..e3f8bda8321 100644
--- a/theme/boost/templates/core/notification_warning.mustache
+++ b/theme/boost/templates/core/notification_warning.mustache
@@ -37,8 +37,8 @@
     { "message": "Your pants are on fire!", "closebutton": 1, "announce": 1, "extraclasses": "foo bar"}
 }}
 <div class="alert alert-warning alert-block fade in {{ extraclasses }}" {{!
-    }}{{# announce }} role="alert"{{/ announce }}{{!
+    }}{{# announce }} role="alert" data-aria-autofocus="true"{{/ announce }}{{!
     }}>
     {{# closebutton }}<button type="button" class="close" data-dismiss="alert">&times;</button>{{/ closebutton }}
     {{{ message }}}
-</div>
\ No newline at end of file
+</div>