diff --git a/css/settings.css b/css/settings.css
index 097dd56..9fae0e2 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -36,18 +36,8 @@
 #user_sql .main .inner-fieldset {
     border-bottom: 1px solid var(--color-border);
     border-top: 1px solid var(--color-border);
-    margin: 16px 0;
-    padding: 8px 32px;
-}
-
-#user_sql .main .inner-fieldset > legend {
-    background-color: var(--color-background-dark);
-    border-radius: var(--border-radius-pill);
-    border: 1px solid var(--color-border-dark);
-    color: var(--color-text-lighter);
-    font-size: 11px;
-    font-weight: bold;
-    padding: 3px 6px;
+    margin: 8px 0;
+    padding: 8px 0 8px 16px;
 }
 
 #user_sql .msg {
diff --git a/js/settings.js b/js/settings.js
index dbe55d7..979770b 100644
--- a/js/settings.js
+++ b/js/settings.js
@@ -72,9 +72,6 @@ user_sql.adminSettingsUI = function () {
                         loading.hide();
 
                         if (data.status === "success") {
-                            if (data.data.length > 0) {
-                                content.append("<legend>" + $("#opt-crypto_class option:selected").text() + "</legend>")
-                            }
                             for (var index = 0, length = data.data.length; index < length; ++index) {
                                 content.append("<div><label for=\"opt-crypto_param_" + index
                                     + "\"><span>" + data.data[index]["name"]
diff --git a/templates/admin.php b/templates/admin.php
index f5fcce8..b2dab49 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -158,9 +158,12 @@ function print_select_options(
                 print_text_input($l, "db-table-user-column-name", "Display name", $_["db.table.user.column.name"]);
                 print_text_input($l, "db-table-user-column-active", "Active", $_["db.table.user.column.active"]);
                 print_text_input($l, "db-table-user-column-avatar", "Provide avatar", $_["db.table.user.column.avatar"]);
-                print_text_input($l, "db-table-user-column-salt", "Salt", $_["db.table.user.column.salt"]);
-                print_checkbox_input($l, "opt-append_salt", "Append salt", $_["opt.append_salt"]);
-                print_checkbox_input($l, "opt-prepend_salt", "Prepend salt", $_["opt.prepend_salt"]); ?>
+                print_text_input($l, "db-table-user-column-salt", "Salt", $_["db.table.user.column.salt"]); ?>
+                <div class="inner-fieldset">
+                    <?php
+                    print_checkbox_input($l, "opt-append_salt", "Append salt", $_["opt.append_salt"]);
+                    print_checkbox_input($l, "opt-prepend_salt", "Prepend salt", $_["opt.prepend_salt"]); ?>
+                </div>
             </fieldset>
         </div>
         <div class="section">