diff --git a/conf/nginx.conf b/conf/nginx.conf
index 82400ac..f984427 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -11,9 +11,9 @@ location __PATHTOCHANGE__ {
        {
               rewrite ^(.+)$ __PATHTOCHANGE__/index.php?q=$1 last;
        }
-       #--PRIVATE--if ($scheme = http) {
-       #--PRIVATE--      rewrite ^ https://$server_name$request_uri? permanent;
-       #--PRIVATE--}
+       if ($scheme = http) {
+             rewrite ^ https://$server_name$request_uri? permanent;
+       }
        client_max_body_size 30m;
        location ~ [^/]\.php(/|$) {
            fastcgi_split_path_info ^(.+?\.php)(/.*)$;
diff --git a/conf/sql/common.sql b/conf/sql/common.sql
index 682a0ea..0bd6d76 100644
--- a/conf/sql/common.sql
+++ b/conf/sql/common.sql
@@ -1,2 +1,3 @@
 INSERT INTO wp_options VALUES('','sll_settings','a:14:{s:14:"account_suffix";s:0:"";s:7:"base_dn";s:27:"ou=users,dc=yunohost,dc=org";s:18:"domain_controllers";a:1:{i:0;s:9:"localhost";}s:9:"directory";s:2:"ol";s:4:"role";s:10:"subscriber";s:13:"high_security";s:5:"false";s:8:"ol_login";s:3:"uid";s:7:"use_tls";s:5:"false";s:9:"ldap_port";s:3:"389";s:12:"ldap_version";s:1:"3";s:12:"create_users";s:4:"true";s:7:"enabled";s:4:"true";s:7:"version";s:3:"1.5";s:6:"groups";a:1:{i:0;s:0:"";}}','yes');
 INSERT INTO wp_options (option_id,option_name,option_value,autoload) VALUES('','WPLANG','__LANGUAGE__','yes') ON DUPLICATE KEY UPDATE option_value=VALUES(option_value);
+UPDATE wp_options SET option_value = 'a:8:{s:13:"allow_wp_auth";b:1;s:10:"auth_label";s:19:"HTTP authentication";s:9:"login_uri";s:40:"https://__DOMAIN_PATH__/wp-login.php";s:10:"logout_uri";s:28:"https://__DOMAIN_PATH__/";s:22:"additional_server_keys";s:13:"PHP_AUTH_USER";s:24:"auto_create_email_domain";s:0:"";s:10:"db_version";i:2;s:16:"auto_create_user";b:0;}' WHERE option_name = 'http_authentication_options' ;
diff --git a/conf/sql/multisite.sql b/conf/sql/multisite.sql
index dfbcba7..0b22009 100644
--- a/conf/sql/multisite.sql
+++ b/conf/sql/multisite.sql
@@ -1,3 +1 @@
-INSERT INTO wp_options VALUES('','http_authentication_options','a:8:{s:13:"allow_wp_auth";b:1;s:10:"auth_label";s:19:"HTTP authentication";s:9:"login_uri";s:40:"https://__DOMAIN_PATH__/wp-login.php";s:10:"logout_uri";s:28:"https://__DOMAIN_PATH__/";s:22:"additional_server_keys";s:13:"PHP_AUTH_USER";s:24:"auto_create_email_domain";s:0:"";s:10:"db_version";i:2;s:16:"auto_create_user";b:0;}','yes');
-#--PUBLIC--UPDATE wp_sitemeta SET meta_value='a:1:{s:39:"simple-ldap-login/Simple-LDAP-Login.php";i:__DATE__;}' WHERE meta_key='active_sitewide_plugins';
-#--PRIVATE--UPDATE wp_sitemeta SET meta_value='a:2:{s:39:"simple-ldap-login/Simple-LDAP-Login.php";i:__DATE__;s:43:"http-authentication/http-authentication.php";i:__DATE__;}' WHERE meta_key='active_sitewide_plugins';
+UPDATE wp_sitemeta SET meta_value='a:2:{s:39:"simple-ldap-login/Simple-LDAP-Login.php";i:__DATE__;s:43:"http-authentication/http-authentication.php";i:__DATE__;}' WHERE meta_key='active_sitewide_plugins';
diff --git a/conf/sql/single.sql b/conf/sql/single.sql
index cfba297..4706c23 100644
--- a/conf/sql/single.sql
+++ b/conf/sql/single.sql
@@ -1,3 +1 @@
-INSERT INTO wp_options VALUES('','http_authentication_options','a:8:{s:13:"allow_wp_auth";b:1;s:10:"auth_label";s:19:"HTTP authentication";s:9:"login_uri";s:40:"https://__DOMAIN_PATH__/wp-login.php";s:10:"logout_uri";s:28:"https://__DOMAIN_PATH__/";s:22:"additional_server_keys";s:13:"PHP_AUTH_USER";s:24:"auto_create_email_domain";s:0:"";s:10:"db_version";i:2;s:16:"auto_create_user";b:1;}','yes');
-#--PRIVATE--UPDATE wp_options SET option_value='a:2:{i:0;s:43:"http-authentication/http-authentication.php";i:1;s:39:"simple-ldap-login/Simple-LDAP-Login.php";}' WHERE option_name='active_plugins';
-#--PUBLIC--UPDATE wp_options SET option_value='a:1:{i:1;s:39:"simple-ldap-login/Simple-LDAP-Login.php";}' WHERE option_name='active_plugins';
+UPDATE wp_options SET option_value='a:2:{i:0;s:43:"http-authentication/http-authentication.php";i:1;s:39:"simple-ldap-login/Simple-LDAP-Login.php";}' WHERE option_name='active_plugins';
\ No newline at end of file
diff --git a/conf/wp-config.php b/conf/wp-config.php
index 09742c6..099b59f 100644
--- a/conf/wp-config.php
+++ b/conf/wp-config.php
@@ -45,5 +45,5 @@ require_once(ABSPATH . 'wp-settings.php');
 
 // Auto update
 define('WP_AUTO_UPDATE_CORE', 'minor');
-add_filter( 'auto_update_plugin', '__return_true' );
-add_filter( 'auto_update_theme', '__return_true' );
+//add_filter( 'auto_update_plugin', '__return_true' );
+//add_filter( 'auto_update_theme', '__return_true' );
diff --git a/manifest.json b/manifest.json
index da95830..a5bfb81 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name": "WordPress MultiSite",
+    "name": "WordPress",
     "id": "wordpress",
     "packaging_format": 1,
     "requirements": {
diff --git a/manifest2.2.json b/manifest2.2.json
index 204fd70..533339b 100644
--- a/manifest2.2.json
+++ b/manifest2.2.json
@@ -1,5 +1,5 @@
 {
-    "name": "WordPress MultiSite",
+    "name": "WordPress",
     "id": "wordpress",
     "packaging_format": 1,
     "description": {
diff --git a/scripts/install b/scripts/install
index ae5d11d..7cd4c07 100644
--- a/scripts/install
+++ b/scripts/install
@@ -78,6 +78,10 @@ then
     touch /force_stop
 fi
 
+if [ "$path" == "/" ] && [ "$multisite" = "Yes" ]; then
+    echo "Multisite option of wordpress doesn't work at root of domain."
+	touch /force_stop
+fi
 
 # Enregistre les infos dans la config YunoHost
 sudo yunohost app setting $app domain -v $domain
@@ -118,7 +122,7 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 
 # Modifie les variables dans le fichier de configuration nginx
 sudo sed -i "s@__PATHTOCHANGE__@$path@g" /etc/nginx/conf.d/$domain.d/$app.conf
-sudo sed -i "s@__FINALPATH__@$final_path@g" /etc/nginx/conf.d/$domain.d/$app.conf
+sudo sed -i "s@__FINALPATH__@$final_path/@g" /etc/nginx/conf.d/$domain.d/$app.conf
 sudo sed -i "s@__NAMETOCHANGE__@$app@g" /etc/nginx/conf.d/$domain.d/$app.conf
 
 # Créer le fichier de configuration du pool php-fpm et le configure.
@@ -159,7 +163,7 @@ done
 sudo chown -R www-data: $final_path
 
 # Donne un accès public pour curl
-sudo yunohost app setting $app skipped_uris -v "/"
+sudo yunohost app setting $app unprotected_uris -v "/"
 # Recharge la configuration Nginx et php5-fpm
 sudo service nginx reload
 sudo service php5-fpm reload
@@ -172,13 +176,13 @@ echo "127.0.0.1 $domain #wordpress_yunohost" | sudo tee -a /etc/hosts
 curl -kL --data "&weblog_title=YunoBlog&user_name=$admin_wordpress&admin_password=$db_pwd&admin_password2=$db_pwd&admin_email=$admin_wordpress@$domain&language=$language&Submit=Install+WordPress" https://$domain$path/wp-admin/install.php?step=2 > /dev/null 2>&1
 
 sleep 5
-mysql -u $db_user -p$db_pwd $db_user -e "select * from wp_options;" > /dev/null 2>&1
+mysql --debug-check -u $db_user -p$db_pwd $db_user -e "select * from wp_options;" > /dev/null 2>&1
 result=$?
 loop_number=1
 while [ $result != 0 ] && [ $loop_number -lt 5 ];
 do
 	sleep 5
-	mysql -u $db_user -p$db_pwd $db_user -e "select * from wp_options;" > /dev/null 2>&1
+	mysql --debug-check -u $db_user -p$db_pwd $db_user -e "select * from wp_options;" > /dev/null 2>&1
 	let result=$?
 	let loop_number++
 done
@@ -188,10 +192,7 @@ sudo sed -i "s@__DOMAIN_PATH__@$domain$path@g" ../conf/sql/*.sql
 sudo sed -i "s/__LANGUAGE__/$language/g" ../conf/sql/*.sql
 sudo sed -i "s/__DATE__/$(date +%s)/g" ../conf/sql/*.sql
 
-# Charge les commandes sql communes à tous les scripts.
-mysql -u $db_user -p$db_pwd $db_user < ../conf/sql/common.sql
-
-if [ "$multisite" = "Yes" ];
+if [ "$multisite" = "Yes" ]
 then
 	# Installation de php5-cli pour wp-cli
 	sudo apt-get update
@@ -208,28 +209,34 @@ then
     # Active le multisite wordpress
     sudo sed -i "s@//--MULTISITE2--define@define@g" $final_path/wp-config.php
 
-    # Charge les commandes sql pour les plugins
-    if [ "$is_public" = "No" ];
-    then
-		sudo sed -i "s@#--PRIVATE--@@g" ../conf/sql/multisite.sql
-    else
-		sudo sed -i "s@#--PUBLIC--@@g" ../conf/sql/multisite.sql
-    fi
-	mysql -u $db_user -p$db_pwd $db_user < ../conf/sql/multisite.sql
+    # Charge les commandes sql pour activer les plugins
+#     if [ "$is_public" = "No" ];
+#     then
+# 		sudo sed -i "s@#--PRIVATE--@@g" ../conf/sql/multisite.sql
+#     else
+# 		sudo sed -i "s@#--PUBLIC--@@g" ../conf/sql/multisite.sql
+#     fi
+	mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/multisite.sql
 else
 	if [ "$is_public" = "No" ];
 	then
 		sudo sed -i "s@#--PRIVATE--@@g" /etc/nginx/conf.d/$domain.d/$app.conf
-		sudo sed -i "s@#--PRIVATE--@@g" ../conf/sql/single.sql
+# 		sudo sed -i "s@#--PRIVATE--@@g" ../conf/sql/single.sql
 	else
 		sudo sed -i "s@//--PUBLIC--define@define@g" $final_path/wp-config.php
 		sudo sed -i "s@#--PRIVATE--@#@g" /etc/nginx/conf.d/$domain.d/$app.conf
-		sudo sed -i "s@#--PUBLIC--@@g" ../conf/sql/single.sql
+# 		sudo sed -i "s@#--PUBLIC--@@g" ../conf/sql/single.sql
 	fi
-	# Charge les commandes sql pour les plugins
-	mysql -u $db_user -p$db_pwd $db_user < ../conf/sql/single.sql
+	# Charge les commandes sql pour activer les plugins
+	mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/single.sql
 fi
 
+# Charge les commandes sql communes à tous les scripts.
+mysql --debug-check -u $db_user -p$db_pwd $db_user < ../conf/sql/common.sql
+
+# Décommente les add_filter, qui aurait provoqué une erreur avec wp-cli
+sudo sed -i "s@//add_filter@add_filter@g" $final_path/wp-config.php
+
 # Configure les droits d'accès au fichiers
 # -rw-r--r-- sur les fichiers
 sudo find $final_path -type f -print0 | xargs -0 sudo chmod 644
@@ -243,7 +250,7 @@ sudo chown -R www-data:root $final_path/wp-content
 if [ "$is_public" = "No" ];
 then
 	# Retire l'accès public
-	sudo yunohost app setting $app skipped_uris -d
+	sudo yunohost app setting $app unprotected_uris -d
 	sudo yunohost app ssowatconf
 fi
 
@@ -252,4 +259,4 @@ sudo sed -i '/#wordpress_yunohost/d' /etc/hosts
 
 sudo service nginx reload
 # wp-cli me semble un peu trop permissif... Il a terminé son travail...
-sudo rm $final_path/wp-cli.phar
+sudo rm -f $final_path/wp-cli.phar