diff --git a/classes/Tools.php b/classes/Tools.php
index 79300fef0..45dd168b6 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1530,6 +1530,9 @@ class ToolsCore
 		if ($medias[2] != '')
 			$media_domains .= 'RewriteCond %{HTTP_HOST} ^'.$medias[2].'$ [OR]'."\n";
 
+		if (Configuration::get('PS_WEBSERVICE_CGI_HOST'))
+			fwrite($write_fd, "RewriteCond %{HTTP:Authorization} ^(.*)\nRewriteRule . - [E=HTTP_AUTHORIZATION:%1]\n\n");
+
 		foreach ($domains as $domain => $list_uri)
 		{
 			$physicals = array();
@@ -1539,7 +1542,7 @@ class ToolsCore
 				fwrite($write_fd, 'RewriteRule . - [E=REWRITEBASE:'.$uri['physical'].']'."\n");
 				
 				// Webservice
-				fwrite($write_fd, 'RewriteRule ^api/?(.*)$ '."%{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]\n\n");
+				fwrite($write_fd, 'RewriteRule ^api/?(.*)$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]'."\n\n");
 				
 				$rewrite_settings = (int)Configuration::get('PS_REWRITING_SETTINGS', null, null, (int)$uri['id_shop']);
 				$domain_rewrite_cond = 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n";
diff --git a/controllers/admin/AdminWebserviceController.php b/controllers/admin/AdminWebserviceController.php
index 35440fbaf..764feefa5 100755
--- a/controllers/admin/AdminWebserviceController.php
+++ b/controllers/admin/AdminWebserviceController.php
@@ -94,6 +94,12 @@ class AdminWebserviceControllerCore extends AdminController
 		parent::__construct();
 	}
 
+	protected function processUpdateOptions()
+	{
+		parent::processUpdateOptions();
+		Tools::generateHtaccess();
+	}
+
 	public function renderForm()
 	{
 		$this->fields_form = array(