diff --git a/modules/cms/controllers/index/_sidepanel.htm b/modules/cms/controllers/index/_sidepanel.htm
index c8eca67c1..e38e5059b 100644
--- a/modules/cms/controllers/index/_sidepanel.htm
+++ b/modules/cms/controllers/index/_sidepanel.htm
@@ -7,6 +7,7 @@
             <?php if ($this->user->hasAccess('cms.manage_pages')): ?>
                 <!-- Pages -->
                 <form
+                    role="form"
                     class="layout <?= ++$visibleCount == 1 ? '' : 'hide' ?>"
                     data-content-id="pages"
                     data-template-type="page"
@@ -18,6 +19,7 @@
             <?php if ($this->user->hasAccess('cms.manage_partials')): ?>
                 <!-- Partials -->
                 <form
+                    role="form"
                     class="layout <?= ++$visibleCount == 1 ? '' : 'hide' ?>"
                     data-content-id="partials"
                     data-template-type="partial"
@@ -29,6 +31,7 @@
             <?php if ($this->user->hasAccess('cms.manage_layouts')): ?>
                 <!-- Layouts -->
                 <form
+                    role="form"
                     class="layout <?= ++$visibleCount == 1 ? '' : 'hide' ?>"
                     data-content-id="layouts"
                     data-template-type="layout"
@@ -40,6 +43,7 @@
             <?php if ($this->user->hasAccess('cms.manage_content')): ?>
                 <!-- Content -->
                 <form
+                    role="form"
                     class="layout <?= ++$visibleCount == 1 ? '' : 'hide' ?>"
                     data-content-id="content"
                     data-template-type="content"
@@ -51,6 +55,7 @@
             <?php if ($this->user->hasAccess('cms.manage_assets')): ?>
                 <!-- Assets -->
                 <form
+                    role="form"
                     class="layout <?= ++$visibleCount == 1 ? '' : 'hide' ?>"
                     data-content-id="assets"
                     data-template-type="asset"
@@ -62,6 +67,7 @@
             <?php if ($this->user->hasAccess(['cms.manage_pages', 'cms.manage_layouts', 'cms.manage_partials'])): ?>
                 <!-- Components -->
                 <form
+                    role="form"
                     class="layout <?= ++$visibleCount == 1 ? '' : 'hide' ?>"
                     data-content-id="components"
                     onsubmit="return false"
diff --git a/modules/system/controllers/updates/_install_plugins.htm b/modules/system/controllers/updates/_install_plugins.htm
index 38c01215c..e7cc71697 100644
--- a/modules/system/controllers/updates/_install_plugins.htm
+++ b/modules/system/controllers/updates/_install_plugins.htm
@@ -2,6 +2,7 @@
 
     <!-- Search -->
     <form
+        role="form"
         id="installPluginsForm"
         data-handler="onInstallPlugin"
         onsubmit="$.oc.installProcess.searchSubmit(this); return false">
diff --git a/modules/system/controllers/updates/_install_themes.htm b/modules/system/controllers/updates/_install_themes.htm
index 61fbd6ac5..f8bce5c63 100644
--- a/modules/system/controllers/updates/_install_themes.htm
+++ b/modules/system/controllers/updates/_install_themes.htm
@@ -2,6 +2,7 @@
 
     <!-- Search -->
     <form
+        role="form"
         id="installThemesForm"
         data-handler="onInstallTheme"
         onsubmit="$.oc.installProcess.searchSubmit(this); return false">
diff --git a/plugins/october/demo/components/todo/default.htm b/plugins/october/demo/components/todo/default.htm
index c9f7b228e..24429ec47 100644
--- a/plugins/october/demo/components/todo/default.htm
+++ b/plugins/october/demo/components/todo/default.htm
@@ -1,4 +1,5 @@
 <form
+    role="form"
     data-request="{{ __SELF__ }}::onAddItem"
     data-request-update="'{{ __SELF__ }}::list': '#result'"
     data-request-success="$('#input-item').val('')"
diff --git a/themes/demo/pages/ajax.htm b/themes/demo/pages/ajax.htm
index 181fe5273..9d82ab843 100644
--- a/themes/demo/pages/ajax.htm
+++ b/themes/demo/pages/ajax.htm
@@ -44,7 +44,7 @@ function onTest()
             <h3 class="panel-title">Calculator</h3>
         </div>
         <div class="panel-body">
-            <form class="form-inline" data-request="onTest" data-request-update="calcresult: '#result'">
+            <form role="form" class="form-inline" data-request="onTest" data-request-update="calcresult: '#result'">
                 <input type="text" class="form-control" value="15" name="value1" style="width:100px">
                 <select class="form-control" name="operation" style="width: 70px">
                     <option>+</option>
diff --git a/themes/demo/partials/explain/ajax.htm b/themes/demo/partials/explain/ajax.htm
index e8a5deea6..2bb258d73 100644
--- a/themes/demo/partials/explain/ajax.htm
+++ b/themes/demo/partials/explain/ajax.htm
@@ -7,7 +7,7 @@
 </p>
 
 <pre>{% filter escape %}<!-- The form -->
-<form data-request="onTest" data-request-update="calcresult: '#result'">
+<form role="form" data-request="onTest" data-request-update="calcresult: '#result'">
     <input type="text" value="15" name="value1">
     <select name="operation">
         <option>+</option>