diff --git a/install/core/SystemHelper.php b/install/core/SystemHelper.php
index 390771c1b3..b80dcfe9d6 100644
--- a/install/core/SystemHelper.php
+++ b/install/core/SystemHelper.php
@@ -35,7 +35,7 @@ class SystemHelper extends \Espo\Core\Utils\System
 
     protected $apiPath;
 
-    protected $modRewriteUrl = '/Metadata';
+    protected $modRewriteUrl = '/';
 
     protected $writableDir = 'data';
 
diff --git a/install/core/actions/step2.php b/install/core/actions/step2.php
index 509770cae8..79da8477b9 100644
--- a/install/core/actions/step2.php
+++ b/install/core/actions/step2.php
@@ -27,6 +27,18 @@
  * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
  ************************************************************************/
 
+$clearedCookieList = [
+    'auth-token-secret',
+    'auth-username',
+    'auth-token',
+];
+
+foreach ($clearedCookieList as $cookieName) {
+    if (!isset($_COOKIE[$cookieName])) continue;
+
+    setcookie($cookieName, null, -1, '/');
+}
+
 $config = $installer->getConfig();
 
 $fields = array(