diff --git a/netbox/dcim/choices.py b/netbox/dcim/choices.py
index fdf9b7f92..019ae09a4 100644
--- a/netbox/dcim/choices.py
+++ b/netbox/dcim/choices.py
@@ -792,7 +792,7 @@ class InterfaceTypeChoices(ChoiceSet):
     TYPE_80211AX = 'ieee802.11ax'
     TYPE_80211AY = 'ieee802.11ay'
     TYPE_802151 = 'ieee802.15.1'
-    TYPE_OTHER_WIRELESS = 'other-Wireless'
+    TYPE_OTHER_WIRELESS = 'other-wireless'
 
     # Cellular
     TYPE_GSM = 'gsm'
diff --git a/netbox/dcim/constants.py b/netbox/dcim/constants.py
index 9e41ed113..80d7558c9 100644
--- a/netbox/dcim/constants.py
+++ b/netbox/dcim/constants.py
@@ -45,6 +45,9 @@ WIRELESS_IFACE_TYPES = [
     InterfaceTypeChoices.TYPE_80211AC,
     InterfaceTypeChoices.TYPE_80211AD,
     InterfaceTypeChoices.TYPE_80211AX,
+    InterfaceTypeChoices.TYPE_80211AY,
+    InterfaceTypeChoices.TYPE_802151,
+    InterfaceTypeChoices.TYPE_OTHER_WIRELESS,
 ]
 
 NONCONNECTABLE_IFACE_TYPES = VIRTUAL_IFACE_TYPES + WIRELESS_IFACE_TYPES
diff --git a/netbox/templates/login.html b/netbox/templates/login.html
index f4dd9c696..40fc6749b 100644
--- a/netbox/templates/login.html
+++ b/netbox/templates/login.html
@@ -42,10 +42,17 @@
     {% if auth_backends %}
       <h6 class="mt-4 mb-3">Or use a single sign-on (SSO) provider:</h6>
       {% for name, display in auth_backends.items %}
-        <h5>
-          {% if display.1 %}<i class="mdi mdi-{{ display.1 }}"></i>{% endif %}
-          <a href="{% url 'social:begin' backend=name %}" class="my-2">{{ display.0 }}</a>
-        </h5>
+        {% if name == 'saml' %}
+          <h5>
+            {% if display.1 %}<i class="mdi mdi-{{ display.1 }}"></i>{% endif %}
+            <a href="{% url 'social:begin' backend=name %}" class="my-2">{{ display.0 }}</a>
+          </h5>
+        {% else %}
+          <h5>
+            {% if display.1 %}<i class="mdi mdi-{{ display.1 }}"></i>{% endif %}
+            <a href="{% url 'social:begin' backend=name %}" class="my-2">{{ display.0 }}</a>
+          </h5>
+        {% endif %}
       {% endfor %}
     {% endif %}
 
diff --git a/netbox/wireless/migrations/0005_alter_wirelesslink_interface_a_and_more.py b/netbox/wireless/migrations/0005_alter_wirelesslink_interface_a_and_more.py
new file mode 100644
index 000000000..64e375e43
--- /dev/null
+++ b/netbox/wireless/migrations/0005_alter_wirelesslink_interface_a_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Django 4.0.7 on 2022-08-24 17:18
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dcim', '0161_cabling_cleanup'),
+        ('wireless', '0004_wireless_tenancy'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='wirelesslink',
+            name='interface_a',
+            field=models.ForeignKey(limit_choices_to={'type__in': ['ieee802.11a', 'ieee802.11g', 'ieee802.11n', 'ieee802.11ac', 'ieee802.11ad', 'ieee802.11ax', 'ieee802.11ay', 'ieee802.15.1', 'other-wireless']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.interface'),
+        ),
+        migrations.AlterField(
+            model_name='wirelesslink',
+            name='interface_b',
+            field=models.ForeignKey(limit_choices_to={'type__in': ['ieee802.11a', 'ieee802.11g', 'ieee802.11n', 'ieee802.11ac', 'ieee802.11ad', 'ieee802.11ax', 'ieee802.11ay', 'ieee802.15.1', 'other-wireless']}, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='dcim.interface'),
+        ),
+    ]