diff --git a/index.php b/index.php
index e1e1397..af4d5bc 100644
--- a/index.php
+++ b/index.php
@@ -34,18 +34,18 @@
         </style>
     </head>
     <body>
-        <a accesskey="l" href="index.php">View list</a>&nbsp;<a accesskey="n" href="index.php?create=true">New note</a>
         <?php
-
             require 'settings.php';
 
-            if (!isset($_SERVER['PHP_AUTH_PW']) || $_SERVER['PHP_AUTH_PW'] != $password) {
+            if ($password && (!isset($_SERVER['PHP_AUTH_PW']) || $_SERVER['PHP_AUTH_PW'] != $password)) {
                 header('WWW-Authenticate: Basic realm="bbn"');
                 header('HTTP/1.0 401 Unauthorized');
                 echo '<p>Access denied.</p>';
                 exit;
             }
 
+            echo '<a accesskey="l" href="index.php">List</a>&nbsp;<a accesskey="n" href="index.php?open=' . time() . '.md">New</a>';
+
             if (isset($_POST['savebutton']))
             {
                 $title = $_POST['title'];
@@ -58,17 +58,20 @@
                 $title = $_POST['title'];
                 rename($dir . '/' . $title, $dir . '/' . $title . '.del');
             }
-            else if (isset($_GET['create']))
-            {
-                $title = time() . '.md';
-                file_put_contents($dir . '/' . $title, '');
-                $_GET['open'] = $title;
-            }
 
             if (isset($_GET['open']))
             {
                 $title = $_GET['open'];
-                $content = file_get_contents($dir . '/' . $title);
+
+                $content = '';
+                if (!file_exists($dir . '/' . $title))
+                {
+                    file_put_contents($dir . '/' . $title, $content);
+                }
+                else
+                {
+                    $content = file_get_contents($dir . '/' . $title);
+                }
 
                 echo '<form action="index.php" method="POST">
                         <br><div><input name="title" value="' . $title . '"></div><br>
