diff --git a/TODO b/TODO
index 777f462..d99832e 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,5 @@
 - SSO / no SSO distinction
-- ?q=admin support
-- URL rewriting
-- Improve security (chown root / www-data)
-- Static cache 
 - Change port ?
+- SHA password
+- URL rewriting
+- Cache optimisation
diff --git a/manifest.json b/manifest.json
index 26b510f..1b6b5a7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -15,36 +15,42 @@
         "install" : [
             {
                 "name": "domain",
+		"type": "domain",
                 "ask": {
-                    "en": "Choose a domain for Movim"
+                    "en": "Pod domain"
+		    "fr": "Domaine du pod"
                 },
                 "example": "domain.org"
-            },
-            {
+            },           
+ 		{
                 "name": "path",
+		"type": "path",
                 "ask": {
-                    "en": "Choose a path for Movim"
+                    "en": "Path"
+		    "fr": "Chemin du pod"
                 },
                 "example": "/movim",
                 "default": "/movim"
             },
-	    {
+            {
                 "name": "admin",
-		"type": "user",
+                "type": "user",
                 "ask": {
                     "en": "Pod administrator"
+		    "fr": "Administrateur du pod"
                 },
-		"example": "homer"
+                "example": "homer"
             },
-	    {
-                "name": "public_site",
+            {
+                "name": "password",
+		"type": "password",
                 "ask": {
-                    "en": "Public pod ?"
+                    "en": "Administrator password",
+                    "fr": "Mot de passe administrateur"
                 },
-                "choices": ["Yes", "No"],
-                "default": "No"
-            },
-	    {
+                "example" : "password"
+            }
+{
                 "name": "language",
                 "ask": {
                     "en": "Pod language",
@@ -53,13 +59,13 @@
                 "choices" : ["en", "fr"],
                 "default" : "en"
             },
-	    {
-                "name": "password",
+            {
+                "name": "public_site",
                 "ask": {
-                    "en": "Administrator password",
-                    "fr": "Mot de passe pour l'administrateur"
+                    "en": "Public pod ?"
                 },
-                "example" : "password"
+                "choices": ["Yes", "No"],
+                "default": "No"
             }
         ]
     }
diff --git a/scripts/install b/scripts/install
index 4dbde27..44908aa 100644
--- a/scripts/install
+++ b/scripts/install
@@ -4,9 +4,9 @@
 domain=$1
 path=$2
 admin=$3
-public_site=$4
+password=$4
 language=$5
-password=$6
+public_site=$6
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a movim