diff --git a/blog/blogpage.php b/blog/blogpage.php
index cb08d9e8f02..0df6f869690 100644
--- a/blog/blogpage.php
+++ b/blog/blogpage.php
@@ -162,17 +162,20 @@ class page_blog extends page_base {
     /////////// Blog page specific functions
     function get_extra_header_string() {
         global $SESSION, $CFG, $USER;
+
         $editformstring = '';        
-        if (!empty($SESSION->blog_editing_enabled) && ($SESSION->blog_editing_enabled)) {
-            $editingString = get_string('turneditingoff');
-        } else {
-            $editingString = get_string('turneditingon');
+        if (blog_isLoggedin()) {
+            if (!empty($SESSION->blog_editing_enabled) && ($SESSION->blog_editing_enabled)) {
+                $editingString = get_string('turneditingoff');
+            } else {
+                $editingString = get_string('turneditingon');
+            }
+            $editformstring = '<form target="'. $CFG->framename .'" method="get" action="'. $CFG->wwwroot .'/blog/set_session_vars.php">'.
+                '<input type="hidden" name="referrer" value="'. me() .'" />'.
+                '<input type="hidden" name="var" value="showediting" />'.
+                '<input type="submit" value="'. $editingString .'" /></form>';
         }
-        $editformstring = '<form target="'. $CFG->framename .'" method="get" action="'. $CFG->wwwroot .'/blog/set_session_vars.php">'.
-            '<input type="hidden" name="referrer" value="'. me() .'" />'.
-            '<input type="hidden" name="var" value="showediting" />'.
-            '<input type="submit" value="'. $editingString .'" /></form>';
-       
+
         return $editformstring;        
     }    
 }
diff --git a/blog/edit.html b/blog/edit.html
index 71d95a84f05..7ad8217cbbc 100755
--- a/blog/edit.html
+++ b/blog/edit.html
@@ -78,7 +78,7 @@
                     }
                 ?>
                 </select>
-                </td>
+                &nbsp;&nbsp;</td>
 
                 <td>
                 <select name="ptags[]" multiple="multiple" size="8">