diff --git a/manifest.json b/manifest.json
index 2320515..ec99b9d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -56,23 +56,22 @@
                 "default": true
             },
             {
-                "name": "admin_email",
-                "type": "string",
+                "name": "admin",
+                "type": "user",
                 "ask": {
-                    "en": "Login email for the chat admin",
-                    "fr": "Adresse email de login pour l’administrateur du chat"
+                    "en": "Choose an admin user",
+                    "fr": "Choisissez l'administrateur"
                 },
-                "example": "john@gmail.com",
-                "optional": false
+                "example": "johndoe",
             },
             {
-                "name": "admin_password",
+                "name": "password",
                 "type": "password",
                 "ask": {
-                    "en": "Password for the chat admin. At least 8 characters.",
-                    "fr": "Mot de passe pour l’administrateur du chat. Minimum 8 caractères."
+                    "en": "Set the administrator password",
+                    "fr": "Définissez le mot de passe administrateur"
                 },
-                "optional": false
+                "example": "Choose a password"
             },
             {
                 "name": "language",
@@ -92,8 +91,7 @@
                     "fr": "Choisissez le nom de l’équipe"
                 },
                 "example": "Team",
-                "default": "Team",
-                "optional": false
+                "default": "Team"
             }
         ]
     }
diff --git a/scripts/install b/scripts/install
index aad75bd..77505c4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -26,8 +26,9 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 is_public=$YNH_APP_ARG_IS_PUBLIC
-admin_email=$YNH_APP_ARG_ADMIN_EMAIL
-admin_password=$YNH_APP_ARG_ADMIN_PASSWORD
+admin=$YNH_APP_ARG_ADMIN
+email=$(ynh_user_get_info "$admin" mail)
+password=$YNH_APP_ARG_PASSWORD
 language=$YNH_APP_ARG_LANGUAGE
 team_display_name=$YNH_APP_ARG_TEAM_DISPLAY_NAME
 
@@ -52,8 +53,8 @@ ynh_script_progression --message="Storing installation settings..." --weight=6
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
 ynh_app_setting_set --app=$app --key=is_public --value=$is_public
-ynh_app_setting_set --app=$app --key=admin_email --value=$admin_email
-ynh_app_setting_set --app=$app --key=admin_password --value=$admin_password
+ynh_app_setting_set --app=$app --key=admin --value=$admin
+ynh_app_setting_set --app=$app --key=password --value=$password
 ynh_app_setting_set --app=$app --key=language --value=$language
 ynh_app_setting_set --app=$app --key=team_display_name --value=$team_display_name
 
@@ -174,14 +175,13 @@ ynh_add_systemd_config
 # CREATE ADMIN AND FIRST TEAM
 #=================================================
 
-admin_username=$(cut -d @ -f 1 <<< "$admin_email")
 team_name=$(echo "$team_display_name" | iconv -f utf8 -t ascii//TRANSLIT//IGNORE | sed -e 's/[^[:alnum:]]/-/g' | tr -s '-' | tr A-Z a-z)
 
 pushd "$final_path"
-	ynh_exec_warn_less ynh_exec_as $app bin/mattermost user create --username "$admin_username" --email "$admin_email" --password "$admin_password" --locale "$language" --system_admin
-	ynh_exec_warn_less ynh_exec_as $app bin/mattermost user verify "$admin_username"
-	ynh_exec_warn_less ynh_exec_as $app bin/mattermost team create --name "$team_name" --display_name "$team_display_name" --email "$admin_email"
-	ynh_exec_warn_less ynh_exec_as $app bin/mattermost team add "$team_name" "$admin_username"
+	ynh_exec_warn_less ynh_exec_as $app bin/mattermost user create --username "$admin" --email "$email" --password "$password" --locale "$language" --system_admin
+	ynh_exec_warn_less ynh_exec_as $app bin/mattermost user verify "$admin"
+	ynh_exec_warn_less ynh_exec_as $app bin/mattermost team create --name "$team_name" --display_name "$team_display_name" --email "$email"
+	ynh_exec_warn_less ynh_exec_as $app bin/mattermost team add "$team_name" "$admin"
 popd
 
 #=================================================