diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
index d105e963f..61f2b735d 100644
--- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
+++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/configuration/settings.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html [<!ENTITY times '&#215;'>]>
 <html xmlns="http://www.w3.org/1999/xhtml" 
       xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
       xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -64,17 +64,53 @@
                                 </td>
                                 <td>#{setting.defaultValue}</td>
                                 <td>
-                                    <button class="btn btn-info" 
-                                            title="#{AdminMessages.getMessage('configuration.settings.table.actions.info.help', [setting.label])}"
-                                            type="button">
-                                         <svg class="bi"
-                                             width="1em"
-                                             height="1em"
-                                             fill="currentColor">
-                                            <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#info-circle" />
-                                         </svg>
-                                        #{AdminMessages['configuration.settings.table.actions.info']}
-                                    </button>
+                                    <c:if test="#{setting.description.length() > 0}">
+                                        <button class="btn btn-info" 
+                                                data-toggle="modal"
+                                                data-target="#setting-info-#{setting.name}"
+                                                title="#{AdminMessages.getMessage('configuration.settings.table.actions.info.help', [setting.label])}"
+                                                type="button">
+                                            <svg class="bi"
+                                                 width="1em"
+                                                 height="1em"
+                                                 fill="currentColor">
+                                                <use xlink:href="#{request.contextPath}/assets/bootstrap/bootstrap-icons.svg#info-circle" />
+                                            </svg>
+                                            #{AdminMessages['configuration.settings.table.actions.info']}
+                                        </button>
+                                        <div aria-hidden="true"
+                                             aria-labelledby="setting-info#{setting.name}-label"
+                                             class="modal fade"
+                                             data-backdrop="static"
+                                             id="setting-info-#{setting.name}"
+                                             tabindex="-1">
+                                            <div class="modal-dialog">
+                                                <div class="modal-content">
+                                                    <div class="modal-header">
+                                                        <h2 class="model-title"
+                                                            id="setting-info-#{setting.name}-label">#{AdminMessages.getMessage('configuration.settings.setting.info.label', [setting.label])}</h2>
+                                                        <button aria-label="#{AdminMessages['configuration.settings.setting.info.close']}"
+                                                                class="close"
+                                                                data-dismiss="modal"
+                                                                type="button"><span aria-hidden="true">&times;</span></button>
+
+                                                    </div>
+                                                    <div class="modal-body">
+                                                        <p>
+                                                            #{setting.description}
+                                                        </p>
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <button class="btn btn-secondary" 
+                                                                data-dismiss="modal"
+                                                                type="button">
+                                                            #{AdminMessages['configuration.settings.setting.info.dismiss']}
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </c:if>
                                 </td>
                                 <td>
                                     <button class="btn btn-primary" 
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
index ee6e5c0b9..e18837fce 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle.properties
@@ -218,3 +218,6 @@ configuration.settings.table.actions.info.help=Show description of setting {0}
 configuration.settings.table.actions.edit=Edit
 configuration.settings.table.actions.reset.help=Reset setting {0} to default value {1}
 configuration.settings.table.actions.reset=Reset
+configuration.settings.setting.info.label=Setting {0} Info
+configuration.settings.setting.info.close=Close
+configuration.settings.setting.info.dismiss=OK
diff --git a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
index ee0018fde..0c917d5f8 100644
--- a/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
+++ b/ccm-core/src/main/resources/org/libreccm/ui/AdminBundle_de.properties
@@ -218,3 +218,6 @@ configuration.settings.table.actions.info.help=Beschreibung f\u00fcr Einstellung
 configuration.settings.table.actions.edit=Bearbeiten
 configuration.settings.table.actions.reset.help=Einstellung {0} auf Standardwert {1} zur\u00fccksetzen
 configuration.settings.table.actions.reset=Zur\u00fccksetzen
+configuration.settings.setting.info.label=Setting {0} Info
+configuration.settings.setting.info.close=Schlie\u00dfen
+configuration.settings.setting.info.dismiss=OK
