diff --git a/templates/login/form.twig b/templates/login/form.twig
index 1dbf346a17..9eab5d9d51 100644
--- a/templates/login/form.twig
+++ b/templates/login/form.twig
@@ -32,41 +32,45 @@
     </legend>
 
     {% if is_arbitrary_server_allowed %}
-      <div class="item form-group">
-        <label for="input_servername" title="{% trans 'You can enter hostname/IP address and port separated by space.' %}">
+      <div class="item form-row">
+        <label for="input_servername" class="col-4 d-flex align-items-center" title="{% trans 'You can enter hostname/IP address and port separated by space.' %}">
           {% trans 'Server:' %}
         </label>
+        <div class="col-8">
         <input type="text" name="pma_servername" id="input_servername" value="{{ default_server }}" size="24" class="textfield" title="
           {%- trans 'You can enter hostname/IP address and port separated by space.' %}">
+        </div>
       </div>
     {% endif %}
 
     <div class="item form-row">
-      <label for="input_username" class="col-3 d-flex align-items-center">
+      <label for="input_username" class="col-4 d-flex align-items-center">
         {% trans 'Username:' %}
       </label>
       <div class="col-8">
-        <input type="text" name="pma_username" id="input_username" value="{{ default_user }}" size="24" class="textfield form-control" autocomplete="username">
+        <input type="text" name="pma_username" id="input_username" value="{{ default_user }}" size="24" class="textfield" autocomplete="username">
       </div>
     </div>
 
     <div class="item form-row">
-      <label for="input_password" class="col-3 d-flex align-items-center">
+      <label for="input_password" class="col-4 d-flex align-items-center">
         {% trans 'Password:' %}
       </label>
       <div class="col-8">
-        <input type="password" name="pma_password" id="input_password" value="" size="24" class="textfield form-control" autocomplete="current-password">
+        <input type="password" name="pma_password" id="input_password" value="" size="24" class="textfield" autocomplete="current-password">
       </div>
     </div>
 
     {% if has_servers %}
-      <div class="item">
-        <label for="select_server">
+      <div class="item form-row">
+        <label for="select_server" class="col-4 d-flex align-items-center">
           {% trans 'Server choice:' %}
         </label>
-        <select name="server" id="select_server"{{ is_arbitrary_server_allowed ? ' onchange="document.forms[\'login_form\'].elements[\'pma_servername\'].value = \'\'"' }}>
-          {{ server_options|raw }}
-        </select>
+        <div class="col-8">
+          <select name="server" id="select_server"{{ is_arbitrary_server_allowed ? ' onchange="document.forms[\'login_form\'].elements[\'pma_servername\'].value = \'\'"' }}>
+            {{ server_options|raw }}
+          </select>
+        </div>
       </div>
     {% else %}
       <input type="hidden" name="server" value="{{ server }}">