diff --git a/ghost/admin/tpl/preview.hbs b/ghost/admin/tpl/preview.hbs
index 7ff02722df..16480506f4 100644
--- a/ghost/admin/tpl/preview.hbs
+++ b/ghost/admin/tpl/preview.hbs
@@ -5,7 +5,7 @@
     {{! TODO: JavaScript toggle featured/unfeatured}}
     <span class="status">{{#if published}}Published{{else}}Written{{/if}}</span>
     <span class="normal">by</span>
-    <span class="author">Joe Bloggs</span>
+    <span class="author">{{#if author.name}}{{author.name}}{{else}}{{author.email_address}}{{/if}}</span>
     <section class="post-controls">
         <a class="post-edit" href="#"><span class="hidden">Edit Post</span></a>
         <a class="post-settings" href="#" data-toggle=".menu-drop-right"><span class="hidden">Post Settings</span></a>
diff --git a/ghost/admin/views/editor.js b/ghost/admin/views/editor.js
index 367eebe91b..7cf916ffb1 100644
--- a/ghost/admin/views/editor.js
+++ b/ghost/admin/views/editor.js
@@ -239,6 +239,7 @@
             // Add the container view for the Publish Bar
             this.addSubview(new PublishBar({el: "#publish-bar", model: this.model})).render();
 
+            this.$('#entry-title').val(this.model.get('title'));
             this.$('#entry-markdown').html(this.model.get('content_raw'));
 
             this.initMarkdown();