Merge branch 'N°1620' into develop

# Conflicts:
#	sources/application/search/searchform.class.inc.php

application/loginwebpage.class.inc.php

@@ -233,6 +233,7 @@ class LoginWebPage extends NiceWebPage
 		try
 		{
 			UserRights::Login($sAuthUser); // Set the user's language (if possible!)
+            /** @var UserInternal $oUser */
             $oUser = UserRights::GetUserObject();
 			if ($oUser == null)
 			{
@@ -257,6 +258,7 @@ class LoginWebPage extends NiceWebPage
 			$sToken = substr(md5(APPROOT.uniqid()), 0, 16);
 			$oUser->Set('reset_pwd_token', $sToken);
 			CMDBObject::SetTrackInfo('Reset password');
+			$oUser->AllowWrite(true);
 			$oUser->DBUpdate();
 
 			$oEmail = new Email();

setup/setuputils.class.inc.php

@@ -984,7 +984,7 @@ EOF
 		);
 
 		$oPage->add_script(
-<<<EOF
+			<<<EOF
 var iCheckDBTimer = null;
 var oXHRCheckDB = null;
 
@@ -1093,7 +1093,7 @@ function ValidateField(sFieldId, bUsed)
 EOF
 		);
 		$oPage->add_ready_script(
-<<<EOF
+			<<<EOF
 DoCheckDBConnection(); // Validate the initial values immediately
 
 $("table#table_db_options").on("keyup change", "tr>td input", function() { CheckDBConnection(); });