diff --git a/mod/wiki/TODO.txt b/mod/wiki/TODO.txt
index 4507b2a0031..ba31a2bd79f 100644
--- a/mod/wiki/TODO.txt
+++ b/mod/wiki/TODO.txt
@@ -13,7 +13,7 @@ Michael:
  - Notify when page changes
 
 Unassigned or not ready:
- - Dump Pages
+ - Wiki HTML: http://moodle.org/mod/forum/discuss.php?d=8920
  - http://moodle.org/mod/forum/discuss.php?d=7768#36954
  - Image Thumbnails http://moodle.org/mod/forum/discuss.php?d=8351
  
diff --git a/mod/wiki/mod.html b/mod/wiki/mod.html
index c6b66b590d7..406309aec19 100644
--- a/mod/wiki/mod.html
+++ b/mod/wiki/mod.html
@@ -4,6 +4,9 @@
 <?php
     require("$CFG->dirroot/mod/wiki/lib.php");
 
+    if (!isset($form->id)) {
+        $form->id = '';
+    }
     if (!isset($form->name)) {
         $form->name = '';
     }
@@ -47,9 +50,15 @@
         $form->pagename = '';
     }
 
+    # Set other variables
+    if (!isset($id)) {
+        $id = '';
+    }
     /// If updating an existing wiki, find out if it has entries.
     if ($form->id) {
         $wikihasentries = wiki_has_entries($form);
+    } else {
+        $wikihasentries=false;
     }
 ?>