diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/50Content b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/50Content
index 52dfbb5..b59bfa5 100644
--- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/50Content
+++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/WebAppVirtualHost/50Content
@@ -21,9 +21,17 @@ my @groups = split(/[;,]/, ($domain->prop('AllowGroups') || ''));
 # ProxyPass ?
 if ($target =~ m|https?://[\d\w\.\-/]*|){
     $OUT .= "    SetEnv proxy-nokeepalive 1\n" if ($keepalive eq 'yes');
-    $OUT .= "    ProxyPass /.well-known/acme-challenge/ !\n" unless ($proxy_acme eq 'enabled');
-    $OUT .= "    ProxyPass / $target\n";
-    $OUT .= "    ProxyPassReverse / $target\n";
+    if ($proxy_acme eq 'disabled'){
+      $OUT .= "    ProxyPass /.well-known/acme-challenge/ !\n";
+    }
+    elsif ($proxy_acme eq 'only'){
+      $OUT .= "    ProxyPass /.well-known/acme-challenge/ $target" . ".well-known/acme-challenge/\n";
+      $OUT .= "    ProxyPassReverse / $target" . ".well-known/acme-challenge/\n";
+    }
+    else{
+      $OUT .= "    ProxyPass / $target\n";
+      $OUT .= "    ProxyPassReverse / $target\n";
+    }
     $OUT .= "    ProxyPreserveHost on\n" if ($preserve eq 'yes');
 }
 # Rewrite ?