diff --git a/install_yunohost b/install_yunohost
index 5d80b22..af86665 100755
--- a/install_yunohost
+++ b/install_yunohost
@@ -122,10 +122,9 @@ function main()
         reboot
     fi
 
-    step post_install || die "Post-installation failed"
-
     info "Installation logs are available in $YUNOHOST_LOG"
     success "YunoHost installation completed !"
+    conclusion
     exit 0
 }
 
@@ -428,51 +427,35 @@ function fix_locales() {
     export LC_ALL
 }
 
-function post_install() {
-    # No postinstall in auto mode
-    [[ "$AUTOMODE" == "1" ]] && return 0
+function conclusion() {
+    # Get first local IP and global IP
+    local local_ip=$(hostname --all-ip-address | awk '{print $1}')
+    local global_ip=$(curl https://ip.yunohost.org 2>/dev/null)
 
-    # Remove whiptail and dialog remains...
-    clear
+    # Will ignore local ip if it's already the global IP (e.g. for some VPS)
+    [[ "$local_ip" != "$global_ip" ]] || local_ip=""
 
-    local text="
-Yunohost packages have been installed successfully!
+    # Formatting
+    [[ -z "$local_ip" ]] || local_ip=$(echo -e "\n    - https://$local_ip/ (local IP, if self-hosting at home)")
+    [[ -z "$global_ip" ]] || global_ip=$(echo -e "\n    - https://$global_ip/ (global IP, if you're on a VPS)")
 
-You can now proceed with Yunohost post-installation.
-This is where you will be asked for :
-- the main DNS domain name of your server
-- the administration password
+    cat << EOF
+===============================================================================
+You should now proceed with Yunohost post-installation. This is where you will
+be asked for :
+  - the main domain of your server ;
+  - the administration password.
 
-You can also perform this step later on your own :
-- either from a shell, by running 'yunohost tools postinstall'
-  as root
-- either from your web browser, by accessing https://yunohost.local
+You can perform this step :
+  - from the command line, by running 'yunohost tools postinstall' as root
+  - or from your web browser, by accessing : ${local_ip}${global_ip}
 
-Please refer to https://yunohost.org/#/postinstall
-for additionnal information.
-
-Do you want to proceed with YunoHost post-installation now?
-"
-    whiptail --title "Post-installation" --yesno "$text" 25 78 \
-        || return 0
-
-    /usr/bin/yunohost tools postinstall
-
-    local POSTINSTALL_EXIT_CODE="$?"
-    while [[ "$POSTINSTALL_EXIT_CODE" != "0" ]] ;
-    do
-        local text_retry="
-Yunohost post-installation has failed.
-
-Do you want to try again now?
-"
-        whiptail --title "Post-installation" --yesno "$text_retry" 12 78 --defaultno \
-            || return $POSTINSTALL_EXIT_CODE
-
-        /usr/bin/yunohost tools postinstall
-        POSTINSTALL_EXIT_CODE="$?"
-    done
-    return 0
+If this is your first time with YunoHost, it is strongly recommended to take
+time to read the administator documentation and in particular the sections
+'Finalizing your setup' and 'Getting to know YunoHost'. It is available at
+the following URL : https://yunohost.org/admindoc
+===============================================================================
+EOF
 }
 
 ###############################################################################