diff --git a/brutaldon/forms.py b/brutaldon/forms.py
index 8edcf04..9a85766 100644
--- a/brutaldon/forms.py
+++ b/brutaldon/forms.py
@@ -24,7 +24,8 @@ class OAuthLoginForm(forms.Form):
 class PreferencesForm(forms.ModelForm):
     class Meta:
         model = Preference
-        fields = ['theme', 'filter_replies', 'filter_boosts', 'timezone']
+        fields = ['theme', 'filter_replies', 'filter_boosts', 'timezone',
+                  'no_javascript', 'notifications', 'click_to_load']
 
 class PostForm(forms.Form):
     """def status_post(self, status, in_reply_to_id=None, media_ids=None,
diff --git a/brutaldon/templates/setup/settings.html b/brutaldon/templates/setup/settings.html
index 5f354db..f3421ca 100644
--- a/brutaldon/templates/setup/settings.html
+++ b/brutaldon/templates/setup/settings.html
@@ -39,6 +39,28 @@
                     </div>
                 </div>
             </div>
+
+            <div class="field">
+                <label class="label checkbox" for="no_javascript">
+                    {% render_field form.no_javascript class+="checkbox" %}
+                    {{ form.no_javascript.label }}
+                </label>
+            </div>
+
+            <div class="field">
+                <label class="label checkbox" for="notifications">
+                    {% render_field form.notifications class+="checkbox" %}
+                    {{ form.notifications.label }}
+                </label>
+            </div>
+
+            <div class="field">
+                <label class="label checkbox" for="click_to_load">
+                    {% render_field form.click_to_load class+="checkbox" %}
+                    {{ form.click_to_load.label }}
+                </label>
+            </div>
+
             <div class="field">
                 <input type="submit" name="submit"
                        value="Save" class="button is-primary" >
diff --git a/brutaldon/views.py b/brutaldon/views.py
index 22e1a75..270bcec 100644
--- a/brutaldon/views.py
+++ b/brutaldon/views.py
@@ -397,6 +397,9 @@ def settings(request):
             account.preferences.filter_replies = form.cleaned_data['filter_replies']
             account.preferences.filter_boosts = form.cleaned_data['filter_boosts']
             account.preferences.timezone = form.cleaned_data['timezone']
+            account.preferences.no_javascript = form.cleaned_data['no_javascript']
+            account.preferences.notifications = form.cleaned_data['notifications']
+            account.preferences.click_to_load = form.cleaned_data['click_to_load']
             request.session['timezone'] = account.preferences.timezone
             account.preferences.save()
             account.save()