diff --git a/src/main/resources/hudson/scm/SubversionSCM/DescriptorImpl/credential-ok.js b/src/main/resources/hudson/scm/SubversionSCM/DescriptorImpl/credential-ok.js
new file mode 100644
index 000000000..97665d0c2
--- /dev/null
+++ b/src/main/resources/hudson/scm/SubversionSCM/DescriptorImpl/credential-ok.js
@@ -0,0 +1,5 @@
+window.addEventListener("DOMContentLoaded", () => {
+    document.querySelector(".svn-credential-ok-close").addEventListener("click", () => {
+        window.close();
+    });
+});
diff --git a/src/main/resources/hudson/scm/SubversionSCM/DescriptorImpl/credentialOK.jelly b/src/main/resources/hudson/scm/SubversionSCM/DescriptorImpl/credentialOK.jelly
index b7fb90b5f..1676d2ce0 100644
--- a/src/main/resources/hudson/scm/SubversionSCM/DescriptorImpl/credentialOK.jelly
+++ b/src/main/resources/hudson/scm/SubversionSCM/DescriptorImpl/credentialOK.jelly
@@ -31,7 +31,8 @@ THE SOFTWARE.
       <p>
         ${%Authentication was successful. Information is stored in Jenkins now.}
       </p>
-      <input type="button" value="${%Close}" class="yui-button" onclick="window.close()" />
+      <st:adjunct includes="hudson.scm.SubversionSCM.DescriptorImpl.credential-ok"/>
+      <button class="jenkins-button svn-credential-ok-close">${%Close}</button>
     </l:main-panel>
   </l:layout>
-</j:jelly>
\ No newline at end of file
+</j:jelly>
diff --git a/src/main/resources/hudson/scm/SubversionTagAction/svn-tagform-update-row.js b/src/main/resources/hudson/scm/SubversionTagAction/svn-tagform-update-row.js
new file mode 100644
index 000000000..5c7f2692d
--- /dev/null
+++ b/src/main/resources/hudson/scm/SubversionTagAction/svn-tagform-update-row.js
@@ -0,0 +1,14 @@
+// update the visual feedback depending on the checkbox state
+function updateRow(changeEvent) {
+    const checkbox = changeEvent.target;
+    checkbox.parentNode.parentNode.style.color = checkbox.checked ? "inherit" : "grey";
+
+    const index = checkbox.getAttribute("data-index");
+    document.querySelector(`input[name="name${index}"]`).disabled = !checkbox.checked;
+}
+
+window.addEventListener("DOMContentLoaded", () => {
+    document.querySelectorAll(".svn-tagform-tag-checkbox").forEach((checkbox) => {
+        checkbox.addEventListener("change", updateRow);
+    });
+});
diff --git a/src/main/resources/hudson/scm/SubversionTagAction/tagForm.jelly b/src/main/resources/hudson/scm/SubversionTagAction/tagForm.jelly
index 2f071b735..20a61bfd5 100644
--- a/src/main/resources/hudson/scm/SubversionTagAction/tagForm.jelly
+++ b/src/main/resources/hudson/scm/SubversionTagAction/tagForm.jelly
@@ -68,6 +68,7 @@ THE SOFTWARE.
         <j:if test="${it.isTagged()}">
           <h2>${%Create more tags}</h2>
         </j:if>
+        <st:adjunct includes="hudson.scm.SubversionTagAction.svn-tagform-update-row"/>
         <form action="submit" method="post" enctype="multipart/form-data" name="tag">
           <table class="middle-align">
             <tr>
@@ -78,8 +79,8 @@ THE SOFTWARE.
             <j:forEach var="m" items="${tags.keySet()}" varStatus="loop">
               <tr>
                 <td><j:if test="${tags.size()!=1}">
-                  <input type="checkbox" name="tag${loop.index}" checked="true"
-                         id="tag${loop.index}" onchange="updateRow(this,${loop.index})" />
+                  <input type="checkbox" name="tag${loop.index}" checked="true" class="svn-tagform-tag-checkbox"
+                         id="tag${loop.index}" data-index="${loop.index}" />
                 </j:if></td>
                 <td style="white-space:nowrap;"><label for="tag${loop.index}">
                   ${m.url} (rev.${m.revision})
@@ -103,13 +104,6 @@ THE SOFTWARE.
             </f:entry>
           </table>
           <f:submit value="${%Tag}" />
-          <script>
-            <!-- update the visual feedback depending on the checkbox state -->
-            function updateRow(e,i) {
-              e.parentNode.parentNode.style.color = e.checked ? "inherit" : "grey";
-              $("name"+i).disabled = !e.checked;
-            }
-          </script>
         </form>
       </j:if>
     </l:main-panel>