diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/87PHPListAlias b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/87PHPListAlias
index d895252..886fe9a 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/87PHPListAlias
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/87PHPListAlias
@@ -2,14 +2,14 @@
 
 my $status = $phplist{'status'} || 'disabled';
 my $access = $phplist{'access'} || 'private';
-my $lemonldap = $phplist{'LemonLDAP'} || 'disabled';
-my $alias =  $phplist{'AliasOnPrimary'} || 'enabled';
-my @users = split(/[;,]/, ($phplist{'AdminUsers'} || 'admin'));
-my $users = join(' ', @users);
+my $auth   = $phplist{'Authentication'} || 'http';
+my $alias  =  $phplist{'AliasOnPrimary'} || 'enabled';
+my @users  = split(/[;,]/, ($phplist{'AdminUsers'} || 'admin'));
+my $users  = join(' ', @users);
 
 my $allow = ( $access eq 'public' ) ? 'all' : "$localAccess $externalSSLAccess";
-$alias = (( $lemonldap eq 'enabled') || ($alias eq 'disabled')) ? '' : 'Alias /lists /usr/share/phplist/www/lists';
-my $auth = ( $lemonldap eq 'enabled' ) ? '' : 'AuthName "phplist"' . "\n" .
+$alias = ($alias ne 'enabled') ? '' : 'Alias /lists /usr/share/phplist/www/';
+my $auth = ( $auth eq 'http' ) ? '' : 'AuthName "phplist"' . "\n" .
                                               "    AuthType Basic\n" .
                                               "    AuthExternal pwauth\n" .
                                               "    require user $users\n";
@@ -19,19 +19,36 @@ if ($status eq 'enabled') {
 
 
 $alias
-<Directory /usr/share/phplist/www/lists>
-    Options -Indexes
+<Directory /usr/share/phplist/www/>
+    Options None
     AllowOverride None
-    order deny,allow
-    deny from all
-    allow from $allow
-    Satisfy all
     AddType application/x-httpd-php .php .php3
+    php_admin_value /usr/share/phplist:/var/lib/phplist:/tmp:/etc/phplist
+    php_admin_flag file_uploads on
+    php_admin_value upload_max_filesize 5M
+    php_admin_value post_max_size 6M
+    php_admin_value memory_limit 128M
+    <FilesMatch "\.(php|inc)\$">
+        Order allow,deny
+        deny from all
+    </FilesMatch>
+    <FilesMatch "(index.php|dl.php|ut.php|lt.php|download.php|connector.php)\$">
+        Order allow,deny
+        allow from $allow
+    </FilesMatch>
 </Directory>
 
 # Admin section
-<Directory /usr/share/phplist/www/lists/admin>
+<Directory /usr/share/phplist/www/admin>
     SSLRequireSSL on
+    <FilesMatch "\.(php|inc)\$">
+        Order allow,deny
+        Deny from all
+    </FilesMatch>
+    <FilesMatch "(index.php|connector.php|upload.php)\$">
+        Order allow,deny
+        allow from all
+    </FilesMatch>
     order deny,allow
     deny from all
     allow from $allow
diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60PhplistSSL b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60PhplistSSL
index d78fde8..e163a41 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60PhplistSSL
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60PhplistSSL
@@ -1,7 +1,8 @@
 {
 my $sslport = $modSSL{'TCPPort'} || '443';
+my $alias = $phplist{'AliasOnPrimary'} || 'enabled';
 
-if ($port ne $sslport){
+if ($port ne $sslport && $alias eq 'enabled'){
 
     ## Redirect Web Address to Secure Address
     $OUT .= "    RewriteEngine on\n";