diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java
index b9679866d..7e55c0ecf 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/CoreShibUiConfiguration.java
@@ -49,7 +49,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 @Configuration
-@EnableConfigurationProperties({CustomPropertiesConfiguration.class, ShibUIConfiguration.class})
+@EnableConfigurationProperties({CustomPropertiesConfiguration.class, ShibUIConfiguration.class, EmailConfiguration.class})
 public class CoreShibUiConfiguration {
     private static final Logger logger = LoggerFactory.getLogger(CoreShibUiConfiguration.class);
 
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EmailConfiguration.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EmailConfiguration.java
index 8377acc7b..aa11a2076 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EmailConfiguration.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/EmailConfiguration.java
@@ -22,22 +22,22 @@
  * @author Bill Smith (wsmith@unicon.net)
  */
 @Configuration
-@ConfigurationProperties("shibui")
+@ConfigurationProperties("shibui.mail")
 public class EmailConfiguration {
 
     private static final String EMAIL_TEMPLATE_ENCODING = "UTF-8";
 
-    //Configured via @ConfigurationProperties (using setter method) with 'shibui.text.email.template.path.prefix' property and
+    //Configured via @ConfigurationProperties (using setter method) with 'shibui.mail.text-email-template-path-prefix' property and
     // default value set here if that property is not explicitly set in application.properties
     @Setter
     private String textEmailTemplatePathPrefix = "/mail/text/";
 
-    //Configured via @ConfigurationProperties (using setter method) with 'shibui.html.email.template.path.prefix' property and
+    //Configured via @ConfigurationProperties (using setter method) with 'shibui.mail.html-email-template-path-prefix' property and
     // default value set here if that property is not explicitly set in application.properties
     @Setter
     private String htmlEmailTemplatePathPrefix = "/mail/html/";
 
-    //Configured via @ConfigurationProperties (using setter method) with 'shibui.system.email.address' property and
+    //Configured via @ConfigurationProperties (using setter method) with 'shibui.mail.system-email-address' property and
     // default value set here if that property is not explicitly set in application.properties
     @Setter
     private String systemEmailAddress = "doNotReply@shibui.org";
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 7a11fdb1d..6e999d002 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -73,4 +73,7 @@ spring.mail.username=username
 spring.mail.password=password
 spring.mail.properties.mail.smtp.auth=false
 spring.mail.properties.mail.smtp.starttls.enable=false
-shibui.system.email.address=doNotReply@shibui.org
+
+shibui.mail.text-email-template-path-prefix=/mail/text/
+shibui.mail.html.email-template-path-prefix=/mail/html/
+shibui.mail.system-email-address=doNotReply@shibui.org