diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/rgw/buckets.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/rgw/buckets.po.ts
index 8d87826da7798..91f852024ffbd 100644
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/rgw/buckets.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/rgw/buckets.po.ts
@@ -51,7 +51,6 @@ export class BucketsPageHelper extends PageHelper {
 
   @PageHelper.restrictTo(pages.create.url)
   checkForDefaultEncryption() {
-    cy.get("cd-helper[aria-label='toggle encryption helper']").click();
     cy.get("a[aria-label='click here']").click();
     cy.get('cd-modal').within(() => {
       cy.get('input[id=s3Enabled]').should('be.checked');
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
index 74b4915cd9c92..551aad7ac5582 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-form/rgw-bucket-form.component.html
@@ -280,30 +280,30 @@
           </div>
         </fieldset>
 
-        <!-- Security -->
+        <!-- Encryption -->
         <fieldset>
           <legend class="cd-header"
-                  i18n>Security</legend>
+                  i18n>Encryption</legend>
           <div class="form-group row">
-            <div class="cd-col-form-offset">
-              <div class="custom-control custom-checkbox">
-                <input class="form-check-input"
-                       id="encryption_enabled"
-                       name="encryption_enabled"
-                       formControlName="encryption_enabled"
-                       type="checkbox"
-                       [attr.disabled]="!kmsVaultConfig && !s3VaultConfig ? true : null">
-                <label class="form-check-label"
-                       for="encryption_enabled"
-                       i18n>Encryption</label>
-                <cd-helper aria-label="toggle encryption helper">
-                  <span i18n>Enables encryption for the objects in the bucket.
-                     To enable encryption on a bucket you need to set the configuration values for SSE-S3 or SSE-KMS.
-                     To set the configuration values <a href="#/rgw/bucket/create"
-                                                        (click)="openConfigModal()"
-                                                        aria-label="click here">Click here</a></span>
-                </cd-helper>
-              </div>
+            <label class="cd-col-form-label pt-0"
+                   for="encryption_enabled"
+                   i18n>
+                    Enable
+            </label>
+            <div class="cd-col-form-input">
+              <input class="form-check-input"
+                     id="encryption_enabled"
+                     name="encryption_enabled"
+                     formControlName="encryption_enabled"
+                     type="checkbox"
+                     [attr.disabled]="!kmsVaultConfig && !s3VaultConfig ? true : null"/>
+              <cd-help-text aria-label="encryption helper">
+                <span i18n>Enables encryption for the objects in the bucket.
+                    To enable encryption on a bucket you need to set the configuration values for SSE-S3 or SSE-KMS.
+                    To set the configuration values <a href="#/rgw/bucket/create"
+                                                       (click)="openConfigModal()"
+                                                       aria-label="click here">Click here</a></span>
+              </cd-help-text>
             </div>
           </div>
 
@@ -391,7 +391,7 @@
         <fieldset>
           <legend class="cd-header"
                   i18n>Tags
-            <cd-helper>Tagging gives you a way to categorize storage</cd-helper>
+            <cd-help-text>Tagging provides a way to categorize storage</cd-help-text>
           </legend>
           <span *ngFor="let tag of tags; let i=index;">
             <ng-container *ngTemplateOutlet="tagTpl; context:{index: i, tag: tag}"></ng-container>