diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 1b28d1a7a..00c9f71d1 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -157,7 +157,7 @@ function rcmail_user_prefs($current = null)
     $no_override = array_flip((array)$RCMAIL->config->get('dont_override'));
 
     foreach ($sections as $idx => $sect) {
-        $sections[$idx]['class'] = $idx;
+        $sections[$idx]['class'] = $sect['class'] ?: $idx;
 
         if ($current && $sect['id'] != $current) {
             continue;