diff --git a/src/assets/js/parts/wishlists.js b/src/assets/js/parts/wishlists.js
index 20882acd..39ac9677 100644
--- a/src/assets/js/parts/wishlists.js
+++ b/src/assets/js/parts/wishlists.js
@@ -47,7 +47,8 @@ $(function () {
 
     $('.ui.dropdown.wishlists')
     .dropdown({
-        onChange : function(wishlist_id, text, choice) {
+        'preserveHTML' : false,
+        'onChange'     : function(wishlist_id, text, choice) {
             wishthis.$_GET.id = wishlist_id;
 
             if (wishlist_id) {
diff --git a/src/classes/wishthis/Wishlist.php b/src/classes/wishthis/Wishlist.php
index 4b61c706..32a667b7 100644
--- a/src/classes/wishthis/Wishlist.php
+++ b/src/classes/wishthis/Wishlist.php
@@ -44,8 +44,8 @@ class Wishlist
             $this->exists = true;
 
             foreach ($columns as $key => $value) {
-                if ('string' === gettype($value)) {
-                    $this->$key = Sanitiser::render($value);
+                if (is_string($value)) {
+                    $this->$key = html_entity_decode($value);
                 } else {
                     $this->$key = $value;
                 }
diff --git a/src/pages/register.php b/src/pages/register.php
index 2236e98e..3ae6826e 100644
--- a/src/pages/register.php
+++ b/src/pages/register.php
@@ -173,7 +173,7 @@ if (isset($_POST['email'], $_POST['password']) && !empty($_POST['planet'])) {
          */
         if ($userRegistered) {
             $user_id       = $database->lastInsertID();
-            $wishlist_name = Sanitiser::getTitle(__('My hopes and dreams'));
+            $wishlist_name = addslashes(filter_var(__('My hopes and dreams'), FILTER_SANITIZE_SPECIAL_CHARS));
             $wishlist_hash = sha1(time() . $user_id . $wishlist_name);
 
             $database