diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
index 1e3c0370d..714bf14bb 100644
--- a/backend/src/main/resources/i18n/messages.properties
+++ b/backend/src/main/resources/i18n/messages.properties
@@ -501,6 +501,7 @@ tooltip.mark-as-default=Mark as Default
 tooltip.protocol-support-enumeration=Protocol Support Enumeration
 tooltip.nameid-format=Content is name identifier format which is added to all the applicable roles of the entities which match any of the following <Entity> or {{<ConditionRef>}}elements.
 tooltip.enable-this-service-upon-saving=If checkbox is clicked, the metadata provider is enabled for integration with the IdP
+tooltip.is-there-a-x509-certificate=Is there a X509 Certificate?
 tooltip.authentication-requests-signed=Authentication Requests Signed
 tooltip.want-assertions-signed=Want Assertions Signed
 tooltip.certificate-name=Certificate Name
diff --git a/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html b/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
index a39f04f4e..b59cc6648 100644
--- a/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
+++ b/ui/src/app/schema-form/widget/boolean-radio/boolean-radio.component.html
@@ -6,17 +6,24 @@
         </span>
     </label>
     <span *ngIf="schema.description" class="sr-only" [translate]="schema.description">{{ schema.description }}</span>
-    <div *ngFor="let option of schema.oneOf; let i=index;" class="form-check form-check-inline">
-        <label class="control-label">
-            <input
-                [id]="formProperty._canonicalPath + '.' + option.enum[0]"
-                [formControl]="control"
-                [name]="name"
-                [value]="option.enum[0]"
-                type="radio"
-                [attr.disabled]="schema.readOnly">&nbsp;
-            <translate-i18n [key]="option.description">{{ option.description }}</translate-i18n>
-        </label>
+    <div class="d-flex">
+        <ng-container *ngFor="let option of schema.oneOf; let i=index;">
+            <div class="custom-control custom-radio custom-control-inline">
+                <input
+                    disableValidation="true"
+                    class="custom-control-input"
+                    [id]="formProperty._canonicalPath + '.' + option.enum[0]"
+                    [formControl]="control"
+                    [name]="name"
+                    [value]="option.enum[0]"
+                    type="radio"
+                    [attr.disabled]="schema.readOnly">
+                <label
+                    class="custom-control-label"
+                    [for]="formProperty._canonicalPath + '.' + option.enum[0]"
+                    [translate]="option.description">{{ option.description }}</label>
+            </div>
+        </ng-container>
     </div>
     <input *ngIf="schema.readOnly" [attr.name]="name" type="hidden" [formControl]="control">
 </div>
\ No newline at end of file
diff --git a/ui/src/app/schema-form/widget/radio/radio.component.html b/ui/src/app/schema-form/widget/radio/radio.component.html
index 4b93da179..ca24c572e 100644
--- a/ui/src/app/schema-form/widget/radio/radio.component.html
+++ b/ui/src/app/schema-form/widget/radio/radio.component.html
@@ -2,10 +2,16 @@
     <label [translate]="schema.title">{{schema.title}}</label>
     <span *ngIf="schema.description" class="formHelp" [translate]="schema.description">{{schema.description}}</span>
     <ng-container *ngFor="let option of schema.oneOf; let i = index;">
-        <div class="form-check" [ngClass]="schema.widget.class">
-            <input class="form-check-input" [formControl]="control" type="radio" [attr.name]="name" [id]="formProperty._canonicalPath + '.' + i" [value]="option.enum[0]" [attr.disabled]="schema.readOnly">
-            <label class="form-check-label" [for]="name" [translate]="option.description">{{option.description}}</label>
+        <div class="custom-control custom-radio custom-control-inline" [ngClass]="schema.widget.class">
+            <input class="custom-control-input"
+                [formControl]="control"
+                type="radio"
+                [attr.name]="name"
+                [id]="formProperty._canonicalPath + '.' + i"
+                [value]="option.enum[0]"
+                [attr.disabled]="schema.readOnly"
+                disableValidation="true">
+            <label class="custom-control-label" [for]="formProperty._canonicalPath + '.' + i" [translate]="option.description">{{option.description}}</label>
         </div>
     </ng-container>
-    <input *ngIf="schema.readOnly" [attr.name]="name" type="hidden" [formControl]="control">
 </div>
\ No newline at end of file