diff --git a/src/web/actions/create_post.rs b/src/web/actions/create_post.rs
index 35881bb..e315a94 100644
--- a/src/web/actions/create_post.rs
+++ b/src/web/actions/create_post.rs
@@ -25,12 +25,14 @@ use crate::{
 pub struct PostForm {
     pub board: Text<String>,
     pub thread: Option<Text<i64>>,
+    #[multipart(rename = "post_name")]
     pub name: Text<String>,
     pub email: Text<String>,
     pub content: Text<String>,
     #[multipart(rename = "files[]")]
     pub files: Vec<TempFile>,
     pub spoiler_files: Option<Text<String>>,
+    #[multipart(rename = "post_password")]
     pub password: Text<String>,
     pub captcha_id: Option<Text<String>>,
     pub captcha_solution: Option<Text<String>>,
diff --git a/src/web/actions/user_post_actions.rs b/src/web/actions/user_post_actions.rs
index 57360be..6c9f580 100644
--- a/src/web/actions/user_post_actions.rs
+++ b/src/web/actions/user_post_actions.rs
@@ -23,6 +23,7 @@ pub struct UserPostActionsForm {
     pub remove_posts: Option<String>,
     pub remove_files: Option<String>,
     pub toggle_spoiler: Option<String>,
+    #[serde(rename = "post_password")]
     pub password: String,
 }
 
diff --git a/src/web/login.rs b/src/web/login.rs
index d650fbb..f717a7e 100755
--- a/src/web/login.rs
+++ b/src/web/login.rs
@@ -32,7 +32,6 @@ pub async fn login_get(ctx: Data<Ctx>, req: HttpRequest) -> Result<HttpResponse,
 #[derive(Deserialize)]
 pub struct LogInForm {
     username: String,
-    #[serde(rename = "account_password")]
     password: String,
 }
 
diff --git a/static/js/autofill.js b/static/js/autofill.js
index c2dcc1b..9aad955 100644
--- a/static/js/autofill.js
+++ b/static/js/autofill.js
@@ -7,8 +7,8 @@ $(function () {
         set_cookie("password", password);
     }
 
-    $('input[name="name"]').attr("value", name);
-    $('input[name="password"]').attr("value", password);
+    $('input[name="post_name"]').attr("value", name);
+    $('input[name="post_password"]').attr("value", password);
 });
 
 function generate_password() {
diff --git a/templates/login.html b/templates/login.html
index 609c7c0..7f4d12a 100755
--- a/templates/login.html
+++ b/templates/login.html
@@ -13,7 +13,7 @@
             </tr>
             <tr>
                 <td class="label">Heslo</td>
-                <td><input name="account_password" type="password" required=""></td>
+                <td><input name="password" type="password" required=""></td>
             </tr>
             <tr>
                 <td colspan="2"><input class="button" type="submit" value="Přihlásit se"></td>
diff --git a/templates/macros/post-actions.html b/templates/macros/post-actions.html
index 3292c8f..5da477f 100644
--- a/templates/macros/post-actions.html
+++ b/templates/macros/post-actions.html
@@ -29,7 +29,7 @@
         </tr>
         <tr>
             <td class="label">Heslo</td>
-            <td><input name="password" type="password"></td>
+            <td><input name="post_password" type="password"></td>
         </tr>
         <tr>
             <td colspan="2">
diff --git a/templates/macros/post-form.html b/templates/macros/post-form.html
index 14c9be9..13d5f6e 100644
--- a/templates/macros/post-form.html
+++ b/templates/macros/post-form.html
@@ -18,7 +18,7 @@
         <tr>
             <td class="label">Jméno</td>
             <td>
-                <input name="name" type="text" placeholder="{{ board.config.0.anon_name }}">
+                <input name="post_name" type="text" placeholder="{{ board.config.0.anon_name }}">
             </td>
         </tr>
         <tr>
@@ -91,7 +91,7 @@
         </tr>
         <tr>
             <td class="label">Heslo <span class="small">(na odstranění)</span></td>
-            <td><input name="password" type="password" required=""></td>
+            <td><input name="post_password" type="password" required=""></td>
         </tr>
         <tr>
             {% if reply %}
diff --git a/templates/staff/accounts.html b/templates/staff/accounts.html
index bb6eca2..f898bb6 100755
--- a/templates/staff/accounts.html
+++ b/templates/staff/accounts.html
@@ -45,7 +45,7 @@
             </tr>
             <tr>
                 <td class="label">Heslo</td>
-                <td><input name="account_password" type="password" required=""></td>
+                <td><input name="password" type="password" required=""></td>
             </tr>
             <tr>
                 <td colspan="2"><input class="button" type="submit" value="Vytvořit účet"></td>
diff --git a/templates/staff/boards.html b/templates/staff/boards.html
index 50c5445..57f4b76 100755
--- a/templates/staff/boards.html
+++ b/templates/staff/boards.html
@@ -35,11 +35,7 @@
 
     {% if tcx.perms.owner() %}
         <input class="button" type="submit" formaction="/staff/actions/remove-boards" value="Odstranit vybrané" formnovalidate>
-    {% endif %}
-
-    <hr>
-    
-    {% if tcx.perms.owner() || tcx.perms.board_config() %}
+        <hr>
         <table class="form-table">
             <tr>
                 <td class="label">Jméno</td>