diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index 251859ae37c85b02855cf6889f3d64627c03c729..fe00c30e6e7d759cba5b193d009bef5084b0c75d 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -61,6 +61,7 @@ awstats_buildstaticpages_pl=/usr/share/awstats/tools/awstats_buildstaticpages.pl
 php_ini_path_apache=/etc/php5/apache2/php.ini
 php_ini_path_cgi=/etc/php5/cgi/php.ini
 check_apache_config=y
+enable_sni=y
 nginx_cgi_socket=/var/run/fcgiwrap.socket
 php_fpm_init_script=php5-fpm
 php_fpm_ini_path=/etc/php5/fpm/php.ini
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 43346e2932ad7bdca320f20a9acf1873dbc5490b..fe2a1c66e582b6695ca052e9392572bfdba3437a 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -438,6 +438,12 @@ $form["tabs"]['web'] = array(
 			'default' => 'y',
 			'value' => array(0 => 'n', 1 => 'y')
 		),
+		'enable_sni' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		'user' => array(
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
index a2ad3a87dfb25aaebeee582880d38f41cf979c1a..ec91e01c66a6f3a7b96112a31bbfeda932395d23 100644
--- a/interface/web/admin/lib/lang/en_server_config.lng
+++ b/interface/web/admin/lib/lang/en_server_config.lng
@@ -148,5 +148,6 @@ $wb["do_not_try_rescue_apache_txt"] = 'Disable apache monitoring';
 $wb["do_not_try_rescue_mysql_txt"] = 'Disable MySQL monitoring';
 $wb["do_not_try_rescue_mail_txt"] = 'Disable Email monitoring';
 $wb["rescue_description_txt"] = '<b>Information:</b> If you want to shut down mysql you have to select the "Disable MySQL monitor" checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb["enable_sni_txt"] = 'Enable SNI';
 
 ?>
\ No newline at end of file
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
index 7eb707cb05fcb607d15ae7c9a02b26d4a5414151..f4ea0bcc2ebc3009e4ba048c14f0a1de4aa49429 100644
--- a/interface/web/admin/templates/server_config_web_edit.htm
+++ b/interface/web/admin/templates/server_config_web_edit.htm
@@ -69,6 +69,12 @@
 						{tmpl_var name='check_apache_config'}
 					</div>
 			</div>
+	  <div class="ctrlHolder apache">
+				<p class="label">{tmpl_var name='enable_sni_txt'}</p>
+					<div class="multiField">
+						{tmpl_var name='enable_sni'}
+					</div>
+			</div>
 	  <div class="ctrlHolder apache">
       	<label for="user">{tmpl_var name='web_user_txt'}</label>
         <input name="user" id="user" value="{tmpl_var name='user'}" size="40" maxlength="255" type="text" class="textInput" />
diff --git a/server/conf/awstats_index.php.master b/server/conf/awstats_index.php.master
index f6ced55f345f23cbb51bc913fcf99eb05ee701d3..90cf909214cae2499ee294105c61c8cee32b1ed8 100644
--- a/server/conf/awstats_index.php.master
+++ b/server/conf/awstats_index.php.master
@@ -5,9 +5,10 @@ function load_content(url)
     iframe.src = url;
 }
 </script>
+
 <?php
 $aw['aw_jump_text'] = 'Jump to previous stats: ';
-$aw['aw_renamed_index'] = 'awsindex.html';
+$aw['aw_renamed_index'] = 'fixedindex.html';
 
 if ($handle = opendir('.'))
 {
@@ -19,22 +20,21 @@ if ($handle = opendir('.'))
                 }
         }
 
-        $month = date("m")+1-1;
-
-        if (date("d") == 1)
-        {
-                        $month = date("m")-1;
-        }
-
+        $month = date("n");
         $year = date("Y");
 
-        if (date("m") == 1)
+        if (date("d") == 1)
         {
-                        $year = date("Y")-1;
-                        $month = "12";
+                $awmonth = date("m")-1;
+                if (date("m") == 1)
+                {
+                        $awyear = date("Y")-1;
+                        $awmonth = "12";
+                }
         }
 
         $awprev[] = $year."-".$month;
+
         closedir($handle);
 }
 
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 7198b9500572a44e5f8d1d678a17472db5552b37..3ffa45d0c44216b94e2bdc460d6d92cc1a9e5a19 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -132,6 +132,8 @@ foreach($records as $rec) {
 	$webalizer = '/usr/bin/webalizer';
 	$webalizer_conf_main = '/etc/webalizer/webalizer.conf';
 	$webalizer_conf = escapeshellcmd($rec['document_root'].'/log/webalizer.conf');
+	
+	unlink($statsdir.'/index.php');
 
 	if(!@is_file($webalizer_conf)) {
 		copy($webalizer_conf_main,$webalizer_conf);
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7a66b811cdd3ddd300ea809098a6d8aab2331d2e..2e14ab01d2369f3935d1817019d4b765b71796ef 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1698,6 +1698,9 @@ class apache2_plugin {
 			file_put_contents($awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf',$content);
 			$app->log('Created AWStats config file: '.$awstats_conf_dir.'/awstats.'.$data['new']['domain'].'.conf',LOGLEVEL_DEBUG);
 		}
+		
+		unlink($data['new']['document_root']."/web/stats/index.html");
+		copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/web/stats/index.php");
 	}
 	
 	//* Delete the awstats configuration file