diff --git a/ehcp/classapp.php b/ehcp/classapp.php
index 30fdb3d..98570b6 100755
--- a/ehcp/classapp.php
+++ b/ehcp/classapp.php
@@ -2245,7 +2245,8 @@ organizationalUnitName	= $unit_name";
 				if ($continue) {
 					$success = $success && $this->executeQuery("update " . $this->conf['subdomainstable']['tablename'] . " set $templatefield='" . $$templatefield . "' where domainname='" . $subdomain["domainname"] . "' AND subdomain ='" . $subdomain["subdomain"] . "' AND id ='" . $id . "'");
 					$success = $success && $this->addDaemonOp("syncdomains", 'xx', $subdomain["domainname"]); # sync only domain that is changed. not all domains... 
-					$this->ok_err_text($success, "Subdomain template modifications were successfully saved and stored in the database.", "Failed to save subdomain template modifications.");
+					$editAgainLink = '<a href="?op=editapachetemplatesubdomain&id=' . $id . '">Edit Subdomain Template Again</a>';
+					$this->ok_err_text($success, "Subdomain template modifications were successfully saved and stored in the database." . '<br>' . $editAgainLink, "Failed to save subdomain template modifications.");
 				}
 			}
 		}
diff --git a/ehcp/etc/nginx/apache_subdomain_template.nginx b/ehcp/etc/nginx/apache_subdomain_template.nginx
index d61433e..a5000f9 100755
--- a/ehcp/etc/nginx/apache_subdomain_template.nginx
+++ b/ehcp/etc/nginx/apache_subdomain_template.nginx
@@ -30,13 +30,6 @@ server {
 		include fastcgi_params;
 		limit_req zone=one burst=5;
 	}
-
-	## Images and static content is treated different
-	location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml|swf)$ {
-		access_log off;
-		expires 30d;
-		root {homedir};
-	}
 	
 	location /.well-known {
 		auth_basic off;
diff --git a/ehcp/etc/nginx_nonssl/apache_subdomain_template.nginx b/ehcp/etc/nginx_nonssl/apache_subdomain_template.nginx
index 54bb474..bfe1708 100755
--- a/ehcp/etc/nginx_nonssl/apache_subdomain_template.nginx
+++ b/ehcp/etc/nginx_nonssl/apache_subdomain_template.nginx
@@ -30,13 +30,6 @@ server {
 		include fastcgi_params;
 		limit_req zone=one burst=5;
 	}
-
-	## Images and static content is treated different
-	location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml|swf)$ {
-		access_log off;
-		expires 30d;
-		root {homedir};
-	}
 	
 	location /.well-known {
 		auth_basic off;
diff --git a/ehcp/etc/nginx_ssl/apache_subdomain_template.nginx b/ehcp/etc/nginx_ssl/apache_subdomain_template.nginx
index 5569628..e8a6a43 100755
--- a/ehcp/etc/nginx_ssl/apache_subdomain_template.nginx
+++ b/ehcp/etc/nginx_ssl/apache_subdomain_template.nginx
@@ -30,13 +30,6 @@ server {
 		include fastcgi_params;
 		limit_req zone=one burst=5;
 	}
-
-	## Images and static content is treated different
-	location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml|swf)$ {
-		access_log off;
-		expires 30d;
-		root {homedir};
-	}
 	
 	location /.well-known {
 		auth_basic off;
@@ -82,13 +75,6 @@ server {
 		include fastcgi_params;
 		limit_req zone=one burst=5;
 	}
-
-	## Images and static content is treated different
-	location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml|swf)$ {
-		access_log off;
-		expires 30d;
-		root {homedir};
-	}
 	
 	location /.well-known {
 		auth_basic off;
diff --git a/ehcp/etc/nginx_sslonly/apache_subdomain_template.nginx b/ehcp/etc/nginx_sslonly/apache_subdomain_template.nginx
index ddaca09..f58ed15 100755
--- a/ehcp/etc/nginx_sslonly/apache_subdomain_template.nginx
+++ b/ehcp/etc/nginx_sslonly/apache_subdomain_template.nginx
@@ -35,13 +35,6 @@ server {
 		include fastcgi_params;
 		limit_req zone=one burst=5;
 	}
-
-	## Images and static content is treated different
-	location ~* ^.+.(jpg|jpeg|gif|css|png|js|ico|xml|swf)$ {
-		access_log off;
-		expires 30d;
-		root {homedir};
-	}
 	
 	location /.well-known {
 		auth_basic off;