diff --git a/plinth/modules/bepasty/templates/bepasty_add.html b/plinth/modules/bepasty/templates/bepasty_add.html
deleted file mode 100644
index 3b9f384c8..000000000
--- a/plinth/modules/bepasty/templates/bepasty_add.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-# SPDX-License-Identifier: AGPL-3.0-or-later
-{% endcomment %}
-
-{% load bootstrap %}
-{% load i18n %}
-{% load static %}
-
-{% block content %}
-
-  <h3>{{ title }}</h3>
-
-  <form class="form form-add" method="post">
-    {% csrf_token %}
-
-    {{ form|bootstrap }}
-
-    <input type="submit" class="btn btn-primary"
-           value="{% trans "Submit" %}"/>
-  </form>
-
-{% endblock %}
diff --git a/plinth/modules/bepasty/tests/test_functional.py b/plinth/modules/bepasty/tests/test_functional.py
index 78818a54f..e5dabd75f 100644
--- a/plinth/modules/bepasty/tests/test_functional.py
+++ b/plinth/modules/bepasty/tests/test_functional.py
@@ -73,7 +73,7 @@ def _add_password(browser):
         browser.find_by_css('#id_bepasty-permissions input[value="{}"]'.format(
             permission)).check()
     browser.fill('bepasty-comment', 'bepasty functional test')
-    functional.submit(browser, form_class='form-add')
+    functional.submit(browser, form_class='form-bepasty')
 
 
 def _remove_all_passwords(browser):
diff --git a/plinth/modules/bepasty/views.py b/plinth/modules/bepasty/views.py
index 70bfff588..74da52ac8 100644
--- a/plinth/modules/bepasty/views.py
+++ b/plinth/modules/bepasty/views.py
@@ -97,9 +97,10 @@ class BepastyView(AppView):
 
 class AddPasswordView(SuccessMessageMixin, FormView):
     """View to add a new password."""
+
     form_class = AddPasswordForm
     prefix = 'bepasty'
-    template_name = 'bepasty_add.html'
+    template_name = 'form.html'
     success_url = reverse_lazy('bepasty:index')
     success_message = _('Password added.')