diff --git a/cookbook/forms.py b/cookbook/forms.py
index 4a1858ec..0c85bab3 100644
--- a/cookbook/forms.py
+++ b/cookbook/forms.py
@@ -12,8 +12,7 @@ class MultiSelectWidget(widgets.SelectMultiple):
 class EmojiWidget(forms.TextInput):
     class Media:
         js = ('custom/js/form_emoji.js',)
-        # TODO add class to input fields so there is no longer a static reference to #id_icon in the js but a class based like in multiselect
-        
+
 
 class EditRecipeForm(forms.ModelForm):
     class Meta:
diff --git a/cookbook/static/custom/js/form_emoji.js b/cookbook/static/custom/js/form_emoji.js
index 0f56171e..8b2fd287 100644
--- a/cookbook/static/custom/js/form_emoji.js
+++ b/cookbook/static/custom/js/form_emoji.js
@@ -1,3 +1,3 @@
 $(document).ready(function () {
-    $('#id_icon').emojioneArea();
+    $('.emojiwidget').emojioneArea();
 });
\ No newline at end of file
diff --git a/cookbook/static/custom/js/form_multiselect.js b/cookbook/static/custom/js/form_multiselect.js
index f4a1a060..ff7cb8f1 100644
--- a/cookbook/static/custom/js/form_multiselect.js
+++ b/cookbook/static/custom/js/form_multiselect.js
@@ -1,3 +1,3 @@
 $(document).ready(function () {
-    $('.selectmultiple').select2();
+    $('.multiselectwidget').select2();
 });
\ No newline at end of file
diff --git a/recipes/settings.py b/recipes/settings.py
index 2ae2ae64..a0d13906 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -45,6 +45,7 @@ INSTALLED_APPS = [
     'django_filters',
     'crispy_forms',
     'rest_framework',
+    'watson',
     'cookbook.apps.CookbookConfig',
 ]
 
diff --git a/requirements.txt b/requirements.txt
index 9af8c310..6a8ea3fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,5 @@ django-tables2
 django-filter
 django-crispy-forms
 djangorestframework
-django-autocomplete-light
\ No newline at end of file
+django-autocomplete-light
+django-watson
\ No newline at end of file