diff --git a/docs/NEWS b/docs/NEWS
index 9f6afeea..d2d647e6 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,12 @@
 Version 2.0 ()
 ------------------------------------------------------------------------
 
+    * Prevent entryproperties from saving/displaying a browser-side
+      stored password that was actually not set.
+      
+    * Stronger check for existing logger interface to prevent errors
+      when it is not actively used.
+    
     * Fix entryproperties being removed when publishing an article
       from the dashboard and by specific plugins (freetag, trackback)
       that modify entry data.
diff --git a/include/functions_trackbacks.inc.php b/include/functions_trackbacks.inc.php
index d2d5203b..354bcaf7 100644
--- a/include/functions_trackbacks.inc.php
+++ b/include/functions_trackbacks.inc.php
@@ -838,7 +838,7 @@ function serendipity_handle_references($id, $author, $title, $text, $dry_run = f
             $query .= (int)$id . ", '" . $i_link . "', '" . $i_location . "')";
             $ins = serendipity_db_query($query);
             if (is_string($ins)) {
-                $serendipity['logger']->debug($ins);
+                if (is_object($serendipity['logger'])) $serendipity['logger']->debug($ins);
             }
 
             $old_references[] = array(
diff --git a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
index 4f1b652c..29eb6dd9 100644
--- a/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
+++ b/plugins/serendipity_event_entryproperties/serendipity_event_entryproperties.php
@@ -331,6 +331,7 @@ class serendipity_event_entryproperties extends serendipity_event
 ?>
             <div class="entryproperties_access_pw form_field">
                 <label for="properties_access_pw"><?php echo PASSWORD; ?>:</label>
+                <input type="password" name="ignore_password" value="" style="display:none">
                 <input id="properties_access_pw" name="serendipity[properties][entrypassword]" type="password" autocomplete="off" value="<?php echo serendipity_specialchars($password); ?>">
             </div>
 <?php
diff --git a/serendipity_config.inc.php b/serendipity_config.inc.php
index dc5ac55f..74f8fd20 100644
--- a/serendipity_config.inc.php
+++ b/serendipity_config.inc.php
@@ -302,7 +302,7 @@ if (serendipity_FUNCTIONS_LOADED !== true) {
 if (!serendipity_db_connect()) {
     $serendipity['lang'] = 'en';
     include(S9Y_INCLUDE_PATH . 'include/lang.inc.php');
-    $serendipity['logger']->critical(DATABASE_ERROR);
+    if (is_object($serendipity['logger'])) $serendipity['logger']->critical(DATABASE_ERROR);
     serendipity_die(DATABASE_ERROR);
 }