diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 26f4043ffe9..d0fd9b7ecf8 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -172,7 +172,7 @@ if (! empty($force_install_message))
 		?>
 		<ul>
 			<li>/var/lib/dolibarr/documents</li>
-			<li>C:/My Documents/dolibarr/</li>
+			<li>C:/My Documents/dolibarr/documents</li>
 		</ul>
 		</td>
 	</tr>
@@ -201,6 +201,7 @@ if (! empty($force_install_message))
 		<ul>
 			<li>http://localhost/</li>
 			<li>http://www.myserver.com:8180/dolibarr</li>
+			<li>https://www.myvirtualfordolibarr.com/</li>
 		</ul>
 		</td>
 	</tr>
@@ -382,7 +383,7 @@ if (! empty($force_install_message))
 				} ?>
 			>
 		</td>
-		<td class="comment"><?php echo $langs->trans("DatabasePrefix"); ?></td>
+		<td class="comment"><?php echo $langs->trans("DatabasePrefixDescription"); ?></td>
 	</tr>
 
 	<tr class="hidesqlite">
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 88dbc76f9a6..c1581d37392 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -566,7 +566,7 @@ function detect_dolibarr_main_url_root()
 		$dolibarr_main_url_root = $_SERVER["SERVER_URL"] . $_SERVER["DOCUMENT_URI"];
 	} // If SCRIPT_URI, SERVER_URL, DOCUMENT_URI not defined (Ie: Apache 2.0.44 for Windows)
 	else {
-		$proto = 'http';
+        $proto = ( (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') || $_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http';
 		if (!empty($_SERVER["HTTP_HOST"])) {
 			$serverport = $_SERVER["HTTP_HOST"];
 		} else {
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 629ac022331..e8a89657b6a 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -50,13 +50,14 @@ ServerPortDescription=Database server port. Keep empty if unknown.
 DatabaseServer=Database server
 DatabaseName=Database name
 DatabasePrefix=Database table prefix
+DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
 AdminLogin=User account for the Dolibarr database owner.
 PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
 CreateUser=Create user account or grant user account permission on the Dolibarr database
 DatabaseSuperUserAccess=Database server - Superuser access
-CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must fill in the user name and password for the superuser account at the bottom of this page.
+CheckToCreateDatabase=Check the box if the database does not exist yet and so must be created.<br>In this case, you must also fill in the user name and password for the superuser account at the bottom of this page.
 CheckToCreateUser=Check the box if:<br>the database user account does not yet exist and so must be created, or<br>if the user account exists but the database does not exist and permissions must be granted.<br>In this case, you must enter the user account and password and <b>also</b> the superuser account name and password at the bottom of this page. If this box is unchecked, database owner and password must already exist.
 DatabaseRootLoginDescription=Superuser account name (to create new databases or new users), mandatory if the database or its owner does not already exist.
 KeepEmptyIfNoPassword=Leave empty if superuser has no password (NOT recommended)