diff --git a/plinth/modules/backups/forms.py b/plinth/modules/backups/forms.py
index 3ccb62956..e118b7eeb 100644
--- a/plinth/modules/backups/forms.py
+++ b/plinth/modules/backups/forms.py
@@ -184,7 +184,7 @@ class EncryptedBackupsMixin(forms.Form):
         choices=[('repokey', _('Key in Repository')), ('none', _('None'))])
     encryption_passphrase = forms.CharField(
         label=_('Passphrase'),
-        help_text=_('Passphrase; Only needed when using encryption.'),
+        help_text=_('Only needed when using encryption.'),
         widget=forms.PasswordInput(), required=False)
     confirm_encryption_passphrase = forms.CharField(
         label=_('Confirm Passphrase'), help_text=_('Repeat the passphrase.'),
@@ -264,9 +264,9 @@ class AddRemoteRepositoryForm(EncryptedBackupsMixin, forms.Form):
                  ('password_auth', _('Password-based Authentication'))])
     ssh_password = forms.CharField(
         label=_('SSH server password'), widget=forms.PasswordInput(),
-        strip=True, help_text=_(
-            'Password of the SSH Server. Required only for Password-based '
-            'Authentication.'), required=False)
+        strip=True,
+        help_text=_('Required only for password-based authentication.'),
+        required=False)
 
     field_order = ['repository', 'ssh_auth_type', 'ssh_password'
                    ] + encryption_fields
diff --git a/plinth/modules/backups/static/backups_add_remote_repository.js b/plinth/modules/backups/static/backups_add_remote_repository.js
index 3377259e3..720a247e9 100644
--- a/plinth/modules/backups/static/backups_add_remote_repository.js
+++ b/plinth/modules/backups/static/backups_add_remote_repository.js
@@ -23,8 +23,8 @@
  */
 
 document.addEventListener('DOMContentLoaded', () => {
-    const keyAuth = document.getElementById('id_ssh_auth_type_0');
-    const passwordAuth = document.getElementById('id_ssh_auth_type_1');
+    const keyAuth = document.getElementById('id_ssh_auth_type_key');
+    const passwordAuth = document.getElementById('id_ssh_auth_type_password');
     const sshPasswordField = document.getElementById('id_ssh_password');
     const encryptionType = document.getElementById('id_encryption');
     const encryptionPassphraseField = document.getElementById('id_encryption_passphrase');
diff --git a/plinth/modules/backups/templates/backups_add_remote_repository.html b/plinth/modules/backups/templates/backups_add_remote_repository.html
index 939195d3c..79754d225 100644
--- a/plinth/modules/backups/templates/backups_add_remote_repository.html
+++ b/plinth/modules/backups/templates/backups_add_remote_repository.html
@@ -17,36 +17,157 @@
   <h3>{{ title }}</h3>
 
   <form class="form" method="post">
+    {% if form.non_field_errors %}
+        <div class="alert alert-danger">
+            <a class="close" data-dismiss="alert">&times;</a>
+            {% for non_field_error in form.non_field_errors %}
+                {{ non_field_error }}
+            {% endfor %}
+        </div>
+    {% endif %}
+
     {% csrf_token %}
 
-    <hr>
-    <div>
-      <h4>{% trans "SSH Client Authentication Key"%}</h4>
-      <p>
-        {% blocktrans trimmed %}
-          {{ box_name }} service has the following SSH client public key:
-        {% endblocktrans %}
-      </p>
-      <pre>{{ ssh_client_public_key }}</pre>
-      <p>
-        {% blocktrans trimmed %}
-          If this public key is added to the authorized keys list on the remote
-          machine, then SSH key authentication will be used instead of
-          password-based authentication.
-        {% endblocktrans %}
-      </p>
-      <p>
-        {% blocktrans trimmed %}
-          Otherwise, {{ box_name }} service will attempt to connect using the
-          password provided in the form below. If successful, then the public
-          key will be automatically added to the authorized keys list, so that
-          future connections do not need the password.
-        {% endblocktrans %}
-      </p>
+    <div class="form-group{% if form.repository.errors %}
+                has-error{% endif %}">
+      <label class="control-label" for="id_repository">
+        {{ form.repository.label }}
+      </label>
+      <div>
+        <input type="text" name="repository" class="form-control"
+               required id="id_repository">
+        {% for error in form.repository.errors %}
+            <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
+        {% endfor %}
+        <p class="help-block">
+          {{ form.repository.help_text|safe }}
+        </p>
+      </div>
     </div>
-    <hr>
 
-    {{ form|bootstrap }}
+    <div class="form-group{% if form.ssh_auth_type.errors %}
+                has-error{% endif %} border border-primary rounded p-3">
+      <h4 class="control-label">{{ form.ssh_auth_type.label }}</h4>
+      <p class="help-block">
+        {{ form.ssh_auth_type.help_text|safe }}
+      </p>
+      {% for error in form.ssh_auth_type.errors %}
+        <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
+      {% endfor %}
+      <fieldset class="form-group border border-secondary rounded p-3">
+        <div class="radio">
+          <label>
+            {{ form.ssh_auth_type.0.tag }}
+            {{ form.ssh_auth_type.0.choice_label }}
+          </label>
+        </div>
+
+        <div>
+          <p>
+            {% blocktrans trimmed %}
+              {{ box_name }} service has the following SSH client public key:
+            {% endblocktrans %}
+          </p>
+          <pre>{{ ssh_client_public_key }}</pre>
+          <p>
+            {% blocktrans trimmed %}
+              The public key must be added to the authorized keys list on the
+              remote machine.
+            {% endblocktrans %}
+          </p>
+        </div>
+      </fieldset>
+
+      <fieldset class="form-group border border-secondary rounded p-3">
+        <div class="radio">
+          <label>
+            {{ form.ssh_auth_type.0.tag }}
+            {{ form.ssh_auth_type.1.choice_label }}
+          </label>
+        </div>
+
+        <p>
+          {% blocktrans trimmed %}
+            {{ box_name }} service will attempt to connect using the provided
+            password. If successful, then the public key will be automatically
+            added to the authorized keys list, so that future connections do
+            not need the password.
+          {% endblocktrans %}
+        </p>
+
+        <div class="form-group{% if form.ssh_password.errors %}
+                    has-error{% endif %}">
+          <label class="control-label" for="id_ssh_password">
+            {{ form.ssh_password.label }}
+          </label>
+          <div>
+            <input type="password" name="ssh_password" class="form-control"
+                   id="id_ssh_password">
+            {% for error in form.ssh_password.errors %}
+              <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
+            {% endfor %}
+            <p class="help-block">
+              {{ form.ssh_password.help_text|safe }}
+            </p>
+          </div>
+        </div>
+      </fieldset>
+    </div>
+
+    <div class="form-group border border-primary rounded p-3">
+      <div class="form-group{% if form.encryption.errors %}
+                  has-error{% endif %}">
+        <label class="control-label" for="id_encryption">
+          {{ form.encryption.label }}
+        </label>
+        <div>
+          <select name="encryption" class="form-control" id="id_encryption">
+            <option value="repokey">{{ form.encryption.0.choice_label }}</option>
+            <option value="none">{{ form.encryption.1.choice_label }}</option>
+          </select>
+          {% for error in form.encryption.errors %}
+            <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
+          {% endfor %}
+          <p class="help-block">
+            {{ form.encryption.help_text|safe }}
+          </p>
+        </div>
+      </div>
+
+      <div class="form-group{% if form.encryption_passphrase.errors %}
+                  has-error{% endif %}">
+        <label class="control-label" for="id_encryption_passphrase">
+          {{ form.encryption_passphrase.label }}
+        </label>
+        <div>
+          <input type="password" name="encryption_passphrase"
+                class="form-control" id="id_encryption_passphrase">
+          {% for error in form.encryption_passphrase.errors %}
+            <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
+          {% endfor %}
+          <p class="help-block">
+            {{ form.encryption_passphrase.help_text|safe }}
+          </p>
+        </div>
+      </div>
+
+      <div class="form-group{% if form.confirm_encryption_passphrase.errors %}
+                  has-error{% endif %}">
+        <label class="control-label" for="id_confirm_encryption_passphrase">
+          {{ form.confirm_encryption_passphrase.label }}
+        </label>
+        <div>
+          <input type="password" name="confirm_encryption_passphrase"
+                class="form-control" id="id_confirm_encryption_passphrase">
+          {% for error in form.confirm_encryption_passphrase.errors %}
+            <span class="help-block {{ form.error_css_class }}">{{ error }}</span>
+          {% endfor %}
+          <p class="help-block">
+            {{ form.confirm_encryption_passphrase.help_text|safe }}
+          </p>
+        </div>
+      </div>
+    </div>
 
     <div class="alert alert-warning d-flex align-items-center" role="alert">
       <div class="me-2">
@@ -57,8 +178,8 @@
         {% blocktrans trimmed %}
           The credentials for this repository are stored on your {{ box_name }}.
           <br />
-          To restore a backup on a new {{ box_name }} you need the SSH credentials
-          and, if chosen, the encryption passphrase.
+          To restore a backup on a new {{ box_name }} you need the SSH
+          credentials and, if chosen, the encryption passphrase.
         {% endblocktrans %}
       </div>
     </div>
diff --git a/plinth/modules/backups/tests/test_functional.py b/plinth/modules/backups/tests/test_functional.py
index 2747bf074..c268a35ce 100644
--- a/plinth/modules/backups/tests/test_functional.py
+++ b/plinth/modules/backups/tests/test_functional.py
@@ -232,10 +232,10 @@ def _add_remote_backup_location(browser, ssh_use_password=True):
     password = functional.get_password(
         functional.config['DEFAULT']['username'])
     if ssh_use_password:
-        browser.find_by_id('id_ssh_auth_type_1').first.check()
+        browser.find_by_id('id_ssh_auth_type_password').first.check()
         browser.find_by_name('ssh_password').fill(password)
     else:
-        browser.find_by_id('id_ssh_auth_type_0').first.check()
+        browser.find_by_id('id_ssh_auth_type_key').first.check()
 
     browser.choose('id_encryption', 'repokey')
     browser.find_by_name('encryption_passphrase').fill(password)