diff --git a/code/BlogEntry.php b/code/BlogEntry.php
index a1d87c5..371906c 100644
--- a/code/BlogEntry.php
+++ b/code/BlogEntry.php
@@ -50,7 +50,10 @@ class BlogEntry extends Page {
 		parent::populateDefaults();
 		
 		$this->setField('Date', date('Y-m-d H:i:s', strtotime('now')));
-		$this->setField('Author', Member::currentUser() ? Member::currentUser()->getName() : '');
+
+		if(Security::database_is_ready() && ($member = Member::currentUser())) {
+			$this->setField('Author', $member->getName());
+		}
 	}
 	
 	function getCMSFields() {