diff --git a/changedetectionio/static/js/watch-settings.js b/changedetectionio/static/js/watch-settings.js
index 803016bc..902e12f4 100644
--- a/changedetectionio/static/js/watch-settings.js
+++ b/changedetectionio/static/js/watch-settings.js
@@ -34,6 +34,7 @@ $(document).ready(function() {
         $('#notification_title').val('');
         $('#notification_body').val('');
         $('#notification_format').val('System default');
-
+        $('#notification_urls').val('');
+        e.preventDefault();
     });
 });
diff --git a/changedetectionio/templates/_common_fields.jinja b/changedetectionio/templates/_common_fields.jinja
index 4c717835..a12f6dff 100644
--- a/changedetectionio/templates/_common_fields.jinja
+++ b/changedetectionio/templates/_common_fields.jinja
@@ -26,7 +26,6 @@
                             <a href="{{url_for('notification_logs')}}" class="pure-button button-secondary button-xsmall" style="font-size: 70%">Notification debug logs</a>
                         </div>
                         <div id="notification-customisation" class="pure-control-group">
-                            <a href="#notifications" id="notification-setting-reset-to-default" class="pure-button button-xsmall" style="float: right; background-color: #5f42dd; border-radius: 4px; font-size: 70%; color: #fff">Use defaults</a>
                             <div class="pure-control-group">
                                 {{ render_field(form.notification_title, class="m-d notification-title", placeholder=settings_application['notification_title']) }}
                                 <span class="pure-form-message-inline">Title for all notifications</span>
diff --git a/changedetectionio/templates/edit.html b/changedetectionio/templates/edit.html
index a52579f5..231c2016 100644
--- a/changedetectionio/templates/edit.html
+++ b/changedetectionio/templates/edit.html
@@ -146,6 +146,8 @@ User-Agent: wonderbra 1.0") }}
                             There are <a href="{{ url_for('settings_page')}}#notifications">system-wide notification URLs enabled</a>, this form will override notification settings for this watch only &dash; an empty Notification URL list here will still send notifications.
                         </div>
                         {% endif %}
+                        <a href="#notifications" id="notification-setting-reset-to-default" class="pure-button button-xsmall" style="right: 20px; top: 20px; position: absolute; background-color: #5f42dd; border-radius: 4px; font-size: 70%; color: #fff">Use system defaults</a>
+
                         {{ render_common_settings_form(form, emailprefix, settings_application) }}
                     </div>
                 </fieldset>