diff --git a/main/css/base.css b/main/css/base.css
index f4dbc8aee0..f5b7f654f3 100644
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -4492,4 +4492,6 @@ data table
     select#question_type_hidden option[value="14"] {background-image: url(../img/icons/32/mcmagl.gif);}
 }
 
-
+.btn-success.btn-install{
+    float: right;
+}
diff --git a/main/install/index.php b/main/install/index.php
index 78ffe2d94b..fb4c042910 100644
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -500,7 +500,7 @@ if ($encryptPassForm == '1') {
         $update_from_version = isset($update_from_version) ? $update_from_version : null;
         $instalation_type_label = get_lang('UpdateFromDokeosVersion').(is_array($update_from_version) ? implode('|', $update_from_version) : '');
     }
-    if (!empty($instalation_type_label)) {
+    if (!empty($instalation_type_label) && empty($_POST['step6'])) {
     	echo '<div class="page-header"><h2>'.$instalation_type_label.'</h2></div>';
     }
     ?>
@@ -720,6 +720,19 @@ if (@$_POST['step2']) {
 
 	//STEP 6 : INSTALLATION PROCESS
 
+    $current_step = 7;
+    $msg = get_lang('InstallExecution');
+    if ($installType == 'update') {
+        $msg = get_lang('UpdateExecution');
+    }
+    echo '<div class="RequirementHeading">'.
+         '	<h2>'.display_step_sequence() . $msg.'</h2>'.
+         '<div id="pleasewait" class="warning-message">'.get_lang('PleaseWaitThisCouldTakeAWhile').'</div>';
+         '</div>';
+    // Push the web server to send these strings before we start the real
+    // installation process
+    flush(); ob_flush();
+    
 	if ($installType == 'update') {
 
 		require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
@@ -829,8 +842,9 @@ if (@$_POST['step2']) {
 		include 'install_db.inc.php';
 		include 'install_files.inc.php';
 	}
-    $current_step = 7;
     display_after_install_message($installType);
+    //Hide the "please wait" message sent previously
+    echo '<script>$(\'#pleasewait\').hide(\'fast\');</script>';
 
 } elseif (@$_POST['step1'] || $badUpdatePath) {
 	//STEP 1 : REQUIREMENTS
diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index 0adc0b8da9..a17e156084 100755
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@@ -2024,16 +2024,7 @@ function display_configuration_settings_form($installType, $urlForm, $languageFo
  * After installation is completed (step 6), this message is displayed.
  */
 function display_after_install_message($installType) {
-    ?>
-    <div class="RequirementHeading">
-    	<h2><?php echo display_step_sequence() . get_lang('CfgSetting'); ?></h2>
-    </div>
-    
-    <div class="RequirementContent">
-    <?php echo get_lang('FirstUseTip'); ?>
-    </div>
-
-    <?php
+    echo '<div class="RequirementContent">'.get_lang('FirstUseTip').'</div>';
     echo '<div class="warning-message">';
     echo '<strong>'.get_lang('SecurityAdvice').'</strong>';
     echo ': ';
@@ -2041,7 +2032,7 @@ function display_after_install_message($installType) {
     echo '</div>';
     ?></form>
     <br />
-    <a class="btn btn-success btn-large" href="../../index.php"><?php echo get_lang('GoToYourNewlyCreatedPortal'); ?></a>
+    <a class="btn btn-success btn-large btn-install" href="../../index.php"><?php echo get_lang('GoToYourNewlyCreatedPortal'); ?></a>
     <?php
 }
 
diff --git a/main/lang/english/install.inc.php b/main/lang/english/install.inc.php
index b412a09c8c..ff59a9f1d0 100644
--- a/main/lang/english/install.inc.php
+++ b/main/lang/english/install.inc.php
@@ -129,5 +129,8 @@ $DatabaseXWillBeCreated = "Database <b>%s</b> will be created";
 $ADatabaseWithTheSameNameAlreadyExists = "A database with the same name <b>already exists</b>.";
 $UserXCantHaveAccessInTheDatabaseX = "User <b>%s</b> doesn't have access in the database <b>%s</b>";
 $DatabaseXCantBeCreatedUserXDoestHaveEnoughPermissions = "Database <b>%s</b> can't be created, user <b>%s</b> doesn't have enough permissions";
-$CourseTestWasCreated = "Course test was created";
-?>
\ No newline at end of file
+$CourseTestWasCreated = "A test course has been created successfully";
+$InstallExecution = "Installation process execution";
+$UpdateExecution = "Update process execution";
+$PleaseWaitThisCouldTakeAWhile = "Please wait. This could take a while...";
+?>
diff --git a/main/lang/english/registration.inc.php b/main/lang/english/registration.inc.php
index 975f6c2168..b740d098ae 100644
--- a/main/lang/english/registration.inc.php
+++ b/main/lang/english/registration.inc.php
@@ -148,7 +148,7 @@ $SubscribeUserToCourseAsTeacher = "Enroll teachers";
 $SendMessage = "Send message";
 $PasswordEncryptedForSecurity = "Your password is encrypted for security reasons. Thus, after pressing the link an e-mail will be sent to you again with your password.";
 $UsersUnsubscribed = "The selected users have been unsubscribed from the training";
-$SystemUnableToSendEmailContact = "Portal unable to send email contact";
+$SystemUnableToSendEmailContact = "This platform was unable to send the email. Please contact";
 $OpenIDCouldNotBeFoundPleaseRegister = "This OpenID could not be found in our database. Please register for a new account. If you have already an account with us, please edit your profile inside your account to add this OpenID";
 $UsernameMaxXCharacters = "The login needs to be maximum %s characters long";
 $PictureUploaded = "Your picture has been uploaded";
diff --git a/main/lang/english/trad4all.inc.php b/main/lang/english/trad4all.inc.php
index 6fcf6820d1..05afefe158 100644
--- a/main/lang/english/trad4all.inc.php
+++ b/main/lang/english/trad4all.inc.php
@@ -1202,7 +1202,7 @@ $XStarsOutOf5 = "%s stars out of 5";
 $Visit = "Visit";
 $Visits = "Visits";
 $YourVote = "Your vote";
-$HottestCourses = "Hottest courses";
+$HottestCourses = "Most popular courses";
 $SentAtX = "Sent at: %s";
 $dateTimeFormatShort = "%b %d, %Y at %I:%M %p";
 $dateTimeFormatShortTimeFirst = "%I:%M %p, %b %d %Y";