diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index a49cf4c..e47258d 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -36,7 +36,7 @@
                 <span class="sr-only">Toggle Dropdown</span>
               </button>
               <div class="dropdown-menu watch-menu">
-                <form method="POST" id="watch_project" name="watch_project" action="{{ url_for('.watch_repo', repo=repo.name, watch=0, user=repo.user.user if repo.is_fork) }}">
+                <form method="POST" id="watch_project" name="watch_project" action="{{ url_for('.watch_repo', user=repo.user.user if repo.is_fork else None, repo=repo.name, watch=0) }}">
                   <a class="dropdown-item" id="watching_button">Unwatch</a>
                   <a class="dropdown-item" id="unwatching_button">Watch</a>
                   {{ forkbuttonform.csrf_token }}
@@ -248,7 +248,7 @@ $(document).ready(function() {
         $("#watch-button").html("Watch");
       } else {
         $("#watch").val('1');
-        action = action.replace('/0/', '/1/');
+        action = action.replace('/0', '/1');
         $('#watch_project').attr('action', action);
         $("#watch-button").html("Unwatch");
       }
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 9faad99..7848718 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -1833,8 +1833,8 @@ def view_project_activity(repo):
         repo=repo_obj,
     )
 
-@APP.route('/watch/<repo>/<watch>/', methods=['POST'])
-@APP.route('/watch/<repo>/<watch>/<user>', methods=['POST'])
+@APP.route('/watch/<repo>/settings/<watch>', methods=['POST'])
+@APP.route('/watch/fork/<user>/<repo>/settings/<watch>', methods=['POST'])
 def watch_repo(repo, watch, user=None):
     """ Marked for watching or Unwatching
     """
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index e0a2085..2d8def4 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -2953,17 +2953,17 @@ index 0000000..fb7093d
             self.assertEqual(output.status_code, 404)
 
             output = self.app.post(
-                '/watch/test/2/', data=data, follow_redirects=True)
+                '/watch/test/settings/2', data=data, follow_redirects=True)
             self.assertEqual(output.status_code, 400)
 
             output = self.app.post(
-                '/watch/test/0/', data=data, follow_redirects=True)
+                '/watch/test/settings/0', data=data, follow_redirects=True)
             self.assertIn(
                 '</button>\n                      You are no longer'
                 ' watching this repo.', output.data)
 
             output = self.app.post(
-                '/watch/test/1/', data=data, follow_redirects=True)
+                '/watch/test/settings/1', data=data, follow_redirects=True)
             self.assertIn(
                 '</button>\n                      From now you are'
                 ' watching this repo.', output.data)
@@ -2979,13 +2979,13 @@ index 0000000..fb7093d
             self.session.commit()
 
             output = self.app.post(
-                '/watch/test/0/foo', data=data, follow_redirects=True)
+                '/watch/fork/foo/test/settings/0', data=data, follow_redirects=True)
             self.assertIn(
                 '</button>\n                      You are no longer'
                 ' watching this repo.', output.data)
 
             output = self.app.post(
-                '/watch/test/1/foo', data=data, follow_redirects=True)
+                '/watch/fork/foo/test/settings/1', data=data, follow_redirects=True)
             self.assertIn(
                 '</button>\n                      From now you are'
                 ' watching this repo.', output.data)