diff --git a/3.0/modules/basket/helpers/basket_installer.php b/3.0/modules/basket/helpers/basket_installer.php
index 0ed7f9aa..41e5e55d 100644
--- a/3.0/modules/basket/helpers/basket_installer.php
+++ b/3.0/modules/basket/helpers/basket_installer.php
@@ -68,7 +68,7 @@ class basket_installer
                  PRIMARY KEY (`id`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-  $db->query("CREATE TABLE IF NOT EXISTS `ipn_messages` (
+  $db->query("CREATE TABLE IF NOT EXISTS {ipn_messages} (
     `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
     `date`  int(11) NOT NULL,
     `key` varchar(20) NOT NULL,
@@ -220,5 +220,6 @@ Thanks");
     $db->query("DROP TABLE IF EXISTS {item_products}");
     $db->query("DROP TABLE IF EXISTS {postage_bands}");
     $db->query("DROP TABLE IF EXISTS {orders}");
+    $db->query("DROP TABLE IF EXISTS {ipn_messages}");
   }
 }
diff --git a/3.0/modules/favourites/views/save_dialog.html.php b/3.0/modules/favourites/views/save_dialog.html.php
index 0d9d88e5..12d1c435 100644
--- a/3.0/modules/favourites/views/save_dialog.html.php
+++ b/3.0/modules/favourites/views/save_dialog.html.php
@@ -8,4 +8,4 @@ if (favourites_configuration::isEmailAdmin()){
 else{
   ?>An e-mail will be sent to you with a link to this list.<?
 }
-?><div id="basketForm"><?= $form ?></div></div>
\ No newline at end of file
+?><div id="favourites-save-form"><?= $form ?></div></div>
\ No newline at end of file
diff --git a/3.0/modules/user_homes/helpers/user_homes_event.php b/3.0/modules/user_homes/helpers/user_homes_event.php
index 65077809..7512b67e 100644
--- a/3.0/modules/user_homes/helpers/user_homes_event.php
+++ b/3.0/modules/user_homes/helpers/user_homes_event.php
@@ -100,9 +100,10 @@ class user_homes_event_Core {
    */
   static function user_edit_form_admin_completed($user, $form) {
     $home = ORM::factory("user_home")->where("id", "=", $user->id)->find();
-    $home->id = $user->id;
-    $home->home = $form->edit_user->user_home->value;
-    $home->save();
+    if ($home->loaded()) {
+      $home->home = $form->edit_user->user_home->value;
+      $home->save();
+    }
   }
 
 
@@ -257,7 +258,7 @@ class user_homes_event_Core {
       // create a user based on username
       $user = identity::create_user($username, $username, $password, $username."@unknown.com");
 
-      identity::add_user_to_group($user,$group->id);
+      identity::add_user_to_group($user,$group);
 
       // create user home
       $home = ORM::factory("user_home")->where("id", "=", $user->id)->find();