diff --git a/public/index.php b/public/index.php
index 0cd1435..86cde3d 100644
--- a/public/index.php
+++ b/public/index.php
@@ -122,13 +122,13 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
         $paste_code = 'green';
     }
 
-    if (!empty($paste_password)) {
+    if (!empty($paste_password) && $editing) {
         if (!$current_user) {
             $error = 'You must be logged in to create a password-protected paste.';
             goto OutPut;
         }
 
-        $paste_password = password_hash($paste_password, PASSWORD_DEFAULT);
+        // $paste_password = password_hash($paste_password, PASSWORD_DEFAULT);
     } else {
         $paste_password = null;
     }
diff --git a/theme/bulma/main.php b/theme/bulma/main.php
index 7a01d02..350e1c5 100644
--- a/theme/bulma/main.php
+++ b/theme/bulma/main.php
@@ -137,13 +137,13 @@
                         </div>
                     </div>
                 </div>
-                <div class="field">
+                <!--<div class="field">
                     <div class="control">
                         <input type="text" class="input pp-width-auto" name="pass" id="pass"
                                placeholder="Password (optional)<?= $current_user ? ' (must be logged in)': '' ?>" autocomplete="new-password"<?= $current_user ? '' : ' disabled="disabled"' ?>
                                value="<?php echo (isset($_POST['pass'])) ? pp_html_escape($_POST['pass']) : ''; ?>"/>
                     </div>
-                </div>
+                </div>-->
 
                 <div class="field">
                     <div class="control">