diff --git a/conf/addon.ini.php b/conf/addon.ini.php
index d091659..c470b81 100644
--- a/conf/addon.ini.php
+++ b/conf/addon.ini.php
@@ -6,27 +6,16 @@
 ;consumerkey = localhost
 ;consumersecret = mysqlusername
 
+[system]
+addon = ldapauth
+
 [ldapauth]
-	// ldap hostname server - required
-	ldap_server = localhost
-	// dn to search users - required
-	ldap_searchdn = ou=users,dc=yunohost,dc=org
-	// attribute to find username - required
-	ldap_userattr = uid
-
-	// admin dn - optional - only if ldap server dont have anonymous access
-	//ldap_binddn = cn=admin,dc=example,dc=com
-	// admin password - optional - only if ldap server dont have anonymous access
-	//ldap_bindpw = password
-
-	// for create Friendica account if user exist in ldap
-	//     required an email and a simple (beautiful) nickname on user ldap object
-	//   active account creation - optional - default none
-	ldap_autocreateaccount = true
-	//   attribute to get email - optional - default : 'mail'
-	ldap_autocreateaccount_emailattribute = mail
-	//   attribute to get nickname - optional - default : 'givenName'
-	ldap_autocreateaccount_nameattribute = givenName
+ldap_server = 'localhost'
+ldap_searchdn = 'ou=users,dc=yunohost,dc=org'
+ldap_userattr = 'uid'
+ldap_autocreateaccount = 'true'
+ldap_autocreateaccount_emailattribute = 'mail'
+ldap_autocreateaccount_nameattribute = 'name'
 
 
 INI;
diff --git a/scripts/upgrade b/scripts/upgrade
index b359fde..e920f3a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -74,10 +74,10 @@ path_url=$(ynh_normalize_url_path $path_url)
 
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source "$final_path"
-sudo cp -af "$tmpdir/.htaccess" "${final_path}/."
-sudo cp -af "$tmpdir/view/smarty3" "${final_path}/view/."
+sudo cp -af "$tmpdir/.htaccess"            "${final_path}/."
+sudo cp -af "$tmpdir/view/smarty3"         "${final_path}/view/."
 sudo cp -af "$tmpdir/config/local.ini.php" "${final_path}/config/."
-
+sudo cp -af "../conf/addon.ini.php"        "${final_path}/config/."
 
 sudo rm -Rf "$tmpdir"