diff --git a/customize.dist/about.html b/customize.dist/about.html
index 8cab87663..920c11096 100644
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@@ -5,7 +5,7 @@
     <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <link rel="stylesheet" type="text/css" data-rewrite-href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>
diff --git a/customize.dist/contact.html b/customize.dist/contact.html
index e4ec47098..a07be93ed 100644
--- a/customize.dist/contact.html
+++ b/customize.dist/contact.html
@@ -5,7 +5,7 @@
     <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <link rel="stylesheet" type="text/css" data-rewrite-href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>
diff --git a/customize.dist/index.html b/customize.dist/index.html
index 6707df677..76cf19b2a 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -5,7 +5,7 @@
     <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <link rel="stylesheet" type="text/css" data-rewrite-href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>
@@ -74,7 +74,7 @@
         </div>
 
         <div id="userForm" class="form-group hidden">
-            <input type="text" id="name" name="name" class="form-control" data-localization-placeholder="login_username" autofocus>
+            <input type="text" id="name" name="name" class="form-control" data-localization-placeholder="login_username">
             <input type="password" id="password" name="password" class="form-control" data-localization-placeholder="login_password">
             <div style="display: none;"><span class="remember form-check"><label for="rememberme" class="form-check-label" data-localization-append="login_remember"><input type="checkbox" id="rememberme" class="form-check-input" checked="checked"></label></span><br></div>
             <button class="btn btn-secondary login half first" data-localization="login_login"></button> <button class="btn btn-success register half" data-localization="login_register"></button>
diff --git a/customize.dist/main.js b/customize.dist/main.js
index bb1ec31f3..f4720afca 100644
--- a/customize.dist/main.js
+++ b/customize.dist/main.js
@@ -62,6 +62,7 @@ define([
             //return;
         } else {
             $main.find('#userForm').removeClass('hidden');
+            $('#name').focus();
         }
 
         var displayCreateButtons = function () {
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html
index ded6929e8..2a9ce3f0b 100644
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@@ -5,7 +5,7 @@
     <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <link rel="stylesheet" type="text/css" data-rewrite-href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>
diff --git a/customize.dist/src/fragments/index.html b/customize.dist/src/fragments/index.html
index 67452a2fa..d38d04a66 100644
--- a/customize.dist/src/fragments/index.html
+++ b/customize.dist/src/fragments/index.html
@@ -9,7 +9,7 @@
         </div>
 
         <div id="userForm" class="form-group hidden">
-            <input type="text" id="name" name="name" class="form-control" data-localization-placeholder="login_username" autofocus>
+            <input type="text" id="name" name="name" class="form-control" data-localization-placeholder="login_username">
             <input type="password" id="password" name="password" class="form-control" data-localization-placeholder="login_password">
             <div style="display: none;"><span class="remember form-check"><label for="rememberme" class="form-check-label" data-localization-append="login_remember"><input type="checkbox" id="rememberme" class="form-check-input" checked="checked"></label></span><br></div>
             <button class="btn btn-secondary login half first" data-localization="login_login"></button> <button class="btn btn-success register half" data-localization="login_register"></button>
diff --git a/customize.dist/src/template.html b/customize.dist/src/template.html
index 069e23511..7bbedf8ad 100644
--- a/customize.dist/src/template.html
+++ b/customize.dist/src/template.html
@@ -5,7 +5,7 @@
     <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <link rel="stylesheet" type="text/css" data-rewrite-href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>
diff --git a/customize.dist/terms.html b/customize.dist/terms.html
index 2a7da226f..09dc3f618 100644
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@@ -5,7 +5,7 @@
     <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <link rel="stylesheet" type="text/css" data-rewrite-href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>
diff --git a/www/settings/index.html b/www/settings/index.html
index 1b5ac3a3a..d9dc0da27 100644
--- a/www/settings/index.html
+++ b/www/settings/index.html
@@ -5,7 +5,7 @@
     <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <link rel="stylesheet" type="text/css" data-rewrite-href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
     <script src="/bower_components/jquery/dist/jquery.min.js"></script>