diff -Nur --no-dereference e-smith-email-5.6.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm e-smith-email-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm
--- e-smith-email-5.6.0.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm	2021-03-11 11:35:28.857000000 -0500
+++ e-smith-email-5.6.0/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/emailsettings.pm	2021-03-11 11:39:56.801000000 -0500
@@ -332,31 +332,20 @@
     #------------------------------------------------------------
 
     my $webmail = ($q->param('WebMail') || 'disabled');
-    if ( $webmail eq "enabled" ) {
-      $db->set_prop('php', "status", $webmail );
-      $db->set_prop('mariadb',"status", $webmail );
-      $db->set_prop('imp',"status", $webmail );
-      $db->set_prop('horde', "status", $webmail );
-      $db->set_prop('imp',"access", "full" );
-      $db->set_prop('horde',"access", "public" );
-      $db->set_prop('horde',"HttpsOnly", "no" );
-    }
-    elsif ( $webmail eq "enabledSSL" ) {
+    if ( $webmail eq "enabledSSL" || $webmail eq "enabled") {
       $db->set_prop('php',"status", "enabled" );
       $db->set_prop('mariadb',"status", "enabled" );
       $db->set_prop('imp',"status", 'enabled' );
       $db->set_prop('horde',"status", 'enabled' );
-      $db->set_prop('imp',"access", "SSL" );
       $db->set_prop('horde',"access", "public" );
       $db->set_prop('horde',"HttpsOnly", "yes" );
     }
 
-    elsif ( $webmail eq "localnetworkSSL" ) {
+    elsif ( $webmail eq "localnetworkSSL" || $webmail eq "localnetwork" ) {
       $db->set_prop('php',"status", "enabled" );
       $db->set_prop('mariadb',"status", "enabled" );
       $db->set_prop('imp',"status", 'enabled' );
       $db->set_prop('horde',"status", 'enabled' );
-      $db->set_prop('imp',"access", "SSL" );
       $db->set_prop('horde',"access", "private" );
       $db->set_prop('horde',"HttpsOnly", "yes" );
      }
@@ -570,7 +559,6 @@
   my $WebmailStatus = "disabled";
 
   my $IMPStatus = $db->get_prop('imp', 'status') || 'disabled';
-  my $SSLonly = $db->get_prop('imp', 'access') || 'disabled';
 
   my $HordeStatus = $db->get_prop('horde', 'status') || 'disabled';
 
@@ -587,7 +575,7 @@
        && ( $PHPStatus eq "enabled"   ) 
        && ( $Networkaccess eq "public"))
     {
-      $WebmailStatus = ( $SSLonly eq "SSL" ) ? "enabledSSL" : "enabled";
+      $WebmailStatus = "enabledSSL" ;
     }
 
   elsif ( ( $IMPStatus eq "enabled" )
@@ -596,7 +584,7 @@
        && ( $PHPStatus eq "enabled"   )
        && ( $Networkaccess eq "private" ))
     {
-      $WebmailStatus = ( $SSLonly eq "SSL" ) ? "localnetworkSSL" : "enabled";
+      $WebmailStatus = "localnetworkSSL";
     }
 
   my $options = get_webmail_options();
@@ -765,10 +753,6 @@
                enabledSSL => 'ENABLED_SECURE_ONLY',
                localnetworkSSL => 'ONLY_LOCAL_NETWORK_SSL' );
 
-    my $access = $db->get_prop('imp', 'access') || 'SSL';
-
-    $options{public} = 'ENABLED_BOTH' if ($access eq 'full');
-
     \%options;
 }