diff --git a/client/components/new-post/password/index.tsx b/client/components/new-post/password/index.tsx
index fca2bba8..267a1220 100644
--- a/client/components/new-post/password/index.tsx
+++ b/client/components/new-post/password/index.tsx
@@ -2,24 +2,24 @@ import { Input, Modal, Note, Spacer } from "@geist-ui/core"
 import { useState } from "react"
 
 type Props = {
-    warning?: boolean
+    creating?: boolean
     isOpen: boolean
     onClose: () => void
     onSubmit: (password: string) => void
 }
 
-const PasswordModal = ({ isOpen, onClose, onSubmit: onSubmitAfterVerify, warning }: Props) => {
+const PasswordModal = ({ isOpen, onClose, onSubmit: onSubmitAfterVerify, creating }: Props) => {
     const [password, setPassword] = useState<string>()
     const [confirmPassword, setConfirmPassword] = useState<string>()
     const [error, setError] = useState<string>()
 
     const onSubmit = () => {
-        if (!password || !confirmPassword) {
+        if (!password || (creating && !confirmPassword)) {
             setError('Please enter a password')
             return
         }
 
-        if (password !== confirmPassword) {
+        if (password !== confirmPassword && creating) {
             setError("Passwords do not match")
             return
         }
@@ -31,7 +31,7 @@ const PasswordModal = ({ isOpen, onClose, onSubmit: onSubmitAfterVerify, warning
         {<Modal visible={isOpen} >
             <Modal.Title>Enter a password</Modal.Title>
             <Modal.Content>
-                {!error && warning && <Note type="warning" label='Warning'>
+                {!error && creating && <Note type="warning" label='Warning'>
                     This doesn&apos;t protect your post from the server administrator.
                 </Note>}
                 {error && <Note type="error" label='Error'>
@@ -39,7 +39,7 @@ const PasswordModal = ({ isOpen, onClose, onSubmit: onSubmitAfterVerify, warning
                 </Note>}
                 <Spacer />
                 <Input width={"100%"} label="Password" marginBottom={1} htmlType="password" placeholder="Password" onChange={(e) => setPassword(e.target.value)} />
-                <Input width={"100%"} label="Confirm" htmlType="password" placeholder="Confirm Password" onChange={(e) => setConfirmPassword(e.target.value)} />
+                {creating && <Input width={"100%"} label="Confirm" htmlType="password" placeholder="Confirm Password" onChange={(e) => setConfirmPassword(e.target.value)} />}
             </Modal.Content>
             <Modal.Action passive onClick={onClose}>Cancel</Modal.Action>
             <Modal.Action onClick={onSubmit}>Submit</Modal.Action>
diff --git a/client/pages/post/protected/[id].tsx b/client/pages/post/protected/[id].tsx
index 72c49790..05ccf4b2 100644
--- a/client/pages/post/protected/[id].tsx
+++ b/client/pages/post/protected/[id].tsx
@@ -91,7 +91,7 @@ const Post = ({ theme, changeTheme }: ThemeProps) => {
     }
 
     if (!post) {
-        return <Page><PasswordModal warning={false} onClose={onClose} onSubmit={onSubmit} isOpen={isPasswordModalOpen} /></Page>
+        return <Page><PasswordModal creating={false} onClose={onClose} onSubmit={onSubmit} isOpen={isPasswordModalOpen} /></Page>
     }
 
     return (