diff --git a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
index 3636300e..e23df8de 100644
--- a/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
+++ b/allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkcreate.html
@@ -36,7 +36,7 @@
                 <div class="card-body">
                     <div class="row justify-content-center">
                         <div class="col-md-6">
-                            <form class="form-signin" role="form" action="" method="POST">
+                            <form role="form" action="" method="POST">
                                 {% csrf_token %}
                                 {% bootstrap_form form %}
 
diff --git a/allianceauth/hrapplications/templates/hrapplications/create.html b/allianceauth/hrapplications/templates/hrapplications/create.html
index 55fa384b..57df45ed 100644
--- a/allianceauth/hrapplications/templates/hrapplications/create.html
+++ b/allianceauth/hrapplications/templates/hrapplications/create.html
@@ -27,7 +27,7 @@
             <div class="card-body">
                 <div class="row justify-content-center">
                     <div class="col-md-8">
-                        <form class="form-signin" method="post">
+                        <form method="post">
                             {% csrf_token %}
 
                             {% for question in questions %}
diff --git a/allianceauth/optimer/templates/optimer/add.html b/allianceauth/optimer/templates/optimer/add.html
index 52f4b7ab..8bcb58bd 100644
--- a/allianceauth/optimer/templates/optimer/add.html
+++ b/allianceauth/optimer/templates/optimer/add.html
@@ -32,7 +32,7 @@
             <div class="card-body">
                 <div class="row justify-content-center">
                     <div class="col-md-6">
-                        <form class="form-signin" role="form" action="" method="POST">
+                        <form role="form" action="" method="POST">
                             {% csrf_token %}
 
                             {% bootstrap_form form %}
diff --git a/allianceauth/optimer/templates/optimer/update.html b/allianceauth/optimer/templates/optimer/update.html
index cec34852..bb9f4a17 100644
--- a/allianceauth/optimer/templates/optimer/update.html
+++ b/allianceauth/optimer/templates/optimer/update.html
@@ -32,7 +32,7 @@
             <div class="card-body">
                 <div class="row justify-content-center">
                     <div class="col-md-6">
-                        <form class="form-signin" role="form" action="" method="POST">
+                        <form role="form" action="" method="POST">
                             {% csrf_token %}
 
                             {% bootstrap_form form %}
diff --git a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
index 4de77370..ba28d870 100644
--- a/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
+++ b/allianceauth/services/modules/openfire/templates/services/openfire/broadcast.html
@@ -29,7 +29,7 @@
                             </div>
                         {% endif %}
 
-                        <form class="form-signin" role="form" action="" method="POST">
+                        <form role="form" action="" method="POST">
                             {% csrf_token %}
 
                             {% bootstrap_form form %}
diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html
index ac23d0c1..67c1fc79 100644
--- a/allianceauth/services/templates/services/fleetformattertool.html
+++ b/allianceauth/services/templates/services/fleetformattertool.html
@@ -28,7 +28,7 @@
                             </div>
                         {% endif %}
 
-                        <form class="form-signin" role="form" action="" method="POST">
+                        <form role="form" action="" method="POST">
                             {% csrf_token %}
 
                             {% bootstrap_form form %}
diff --git a/allianceauth/services/templates/services/service_credentials.html b/allianceauth/services/templates/services/service_credentials.html
index 0ed536d1..bb65410c 100644
--- a/allianceauth/services/templates/services/service_credentials.html
+++ b/allianceauth/services/templates/services/service_credentials.html
@@ -9,7 +9,7 @@
         <div class="container">
             <div class="row justify-content-center">
                 <div class="col-md-4 align-self-center">
-                    <form class="form-signin">
+                    <form>
                         {% for key, value in credentials.items %}
                             <div class="mb-3">
                                 <label class="form-label" for="id_{{ key }}">{{ key|capfirst }}</label>
@@ -17,6 +17,7 @@
                             </div>
                         {% endfor %}
                     </form>
+
                     <a href="{% url 'services:services' %}" class="btn btn-lg btn-block btn-primary" title="Continue">{% translate "Continue" %}</a>
                 </div>
             </div>
diff --git a/allianceauth/services/templates/services/service_password.html b/allianceauth/services/templates/services/service_password.html
index d431868d..baea4173 100644
--- a/allianceauth/services/templates/services/service_password.html
+++ b/allianceauth/services/templates/services/service_password.html
@@ -10,7 +10,7 @@
         <div class="container">
             <div class="row justify-content-center">
                 <div class="col-md-4 align-self-center">
-                    <form class="form-signin" role="form" action="" method="POST" onsubmit="submitbutton.disabled = true; return true;">
+                    <form role="form" action="" method="POST" onsubmit="submitbutton.disabled = true; return true;">
                         {% csrf_token %}
                         {% bootstrap_form form %}
                         <br>
diff --git a/allianceauth/srp/templates/srp/add.html b/allianceauth/srp/templates/srp/add.html
index 708fc2fe..502d21a1 100644
--- a/allianceauth/srp/templates/srp/add.html
+++ b/allianceauth/srp/templates/srp/add.html
@@ -32,7 +32,7 @@
                 <div class="row justify-content-center">
                     <div class="col-md-6">
                         {% if completed == False %}
-                            <form class="form-signin" role="form" action="" method="POST">
+                            <form role="form" action="" method="POST">
                                 {% csrf_token %}
 
                                 {% bootstrap_form form %}
diff --git a/allianceauth/srp/templates/srp/request.html b/allianceauth/srp/templates/srp/request.html
index 08a0dfef..550d5e6e 100644
--- a/allianceauth/srp/templates/srp/request.html
+++ b/allianceauth/srp/templates/srp/request.html
@@ -27,7 +27,7 @@
             <div class="card-body">
                 <div class="row justify-content-center">
                     <div class="col-md-6">
-                        <form class="form-signin" role="form" action="" method="POST">
+                        <form role="form" action="" method="POST">
                             {% csrf_token %}
 
                             {% bootstrap_form form %}
diff --git a/allianceauth/srp/templates/srp/update.html b/allianceauth/srp/templates/srp/update.html
index fe8eba41..1641a234 100644
--- a/allianceauth/srp/templates/srp/update.html
+++ b/allianceauth/srp/templates/srp/update.html
@@ -32,7 +32,7 @@
                                 {% translate "SRP Fleet Does Not Exist" %}
                             </div>
                         {% else %}
-                            <form class="form-signin" role="form" action="" method="POST">
+                            <form role="form" action="" method="POST">
                                 {% csrf_token %}
 
                                 {% bootstrap_form form %}
diff --git a/allianceauth/timerboard/templates/timerboard/form.html b/allianceauth/timerboard/templates/timerboard/form.html
index 5273918b..d88fcb59 100644
--- a/allianceauth/timerboard/templates/timerboard/form.html
+++ b/allianceauth/timerboard/templates/timerboard/form.html
@@ -28,7 +28,7 @@
             <div class="card-body">
                 <div class="row justify-content-center">
                     <div class="col-md-6">
-                        <form class="form-signin" role="form" action="" method="POST">
+                        <form id="add-timer-form" role="form" action="" method="POST">
                             {% csrf_token %}
 
                             {% bootstrap_form form %}