diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
index f447cbc371..d4a26c81df 100644
--- a/libraries/classes/Server/Privileges.php
+++ b/libraries/classes/Server/Privileges.php
@@ -1544,35 +1544,17 @@ class Privileges
      *
      * @return string
      */
-    public function getHtmlForSpecificTablePrivileges($db, $table)
+    public function getHtmlForSpecificTablePrivileges(string $db, string $table): string
     {
-        $html_output = '';
-        if ($this->dbi->isSuperuser()) {
-            // check the privileges for a particular table.
-            $html_output  = '<form id="usersForm" action="' . Url::getFromRoute('/server/privileges') . '">';
-            $html_output .= Url::getHiddenInputs($db, $table);
-            $html_output .= '<fieldset>';
-            $scriptName = Util::getScriptNameForOption(
-                $GLOBALS['cfg']['DefaultTabTable'],
-                'table'
-            );
-            $html_output .= '<legend>'
-                . Util::getIcon('b_usrcheck')
-                . sprintf(
-                    __('Users having access to "%s"'),
-                    '<a href="' . $scriptName
-                    . Url::getCommon([
-                        'db' => $db,
-                        'table' => $table,
-                    ], strpos($scriptName, '?') === false ? '?' : '&') . '">'
-                    . htmlspecialchars($db) . '.' . htmlspecialchars($table)
-                    . '</a>'
-                )
-                . '</legend>';
+        global $cfg, $pmaThemeImage, $text_dir, $is_createuser;
 
-            $html_output .= '<div class="responsivetable jsresponsive">';
-            $html_output .= '<table id="tablespecificuserrights" class="data">';
-            $html_output .= $this->getHtmlForPrivsTableHead();
+        $scriptName = Util::getScriptNameForOption(
+            $cfg['DefaultTabTable'],
+            'table'
+        );
+
+        $tableBody = '';
+        if ($this->dbi->isSuperuser()) {
             $privMap = $this->getPrivMap($db);
             $sql_query = "SELECT `User`, `Host`, `Db`,"
                 . " 't' AS `Type`, `Table_name`, `Table_priv`"
@@ -1583,31 +1565,20 @@ class Privileges
                 . " ORDER BY `User` ASC, `Host` ASC, `Db` ASC, `Table_priv` ASC;";
             $res = $this->dbi->query($sql_query);
             $this->mergePrivMapFromResult($privMap, $res);
-            $html_output .= $this->getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db);
-            $html_output .= '</table></div>';
 
-            $html_output .= '<div class="floatleft">';
-            $html_output .= $this->template->render('select_all', [
-                'pma_theme_image' => $GLOBALS['pmaThemeImage'],
-                'text_dir' => $GLOBALS['text_dir'],
-                'form_name' => "usersForm",
-            ]);
-            $html_output .= Util::getButtonOrImage(
-                'submit_mult',
-                'mult_submit',
-                __('Export'),
-                'b_tblexport',
-                'export'
-            );
-
-            $html_output .= '</fieldset>';
-            $html_output .= '</form>';
-        } else {
-            $html_output .= $this->getHtmlForViewUsersError();
+            $tableBody = $this->getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db);
         }
-        // Offer to create a new user for the current database
-        $html_output .= $this->getAddUserHtmlFieldset($db, $table);
-        return $html_output;
+
+        return $this->template->render('server/privileges/table', [
+            'db' => $db,
+            'table' => $table,
+            'is_superuser' => $this->dbi->isSuperuser(),
+            'table_url' => $scriptName,
+            'pma_theme_image' => $pmaThemeImage,
+            'text_dir' => $text_dir,
+            'table_body' => $tableBody,
+            'is_createuser' => $is_createuser,
+        ]);
     }
 
     /**
@@ -1664,26 +1635,6 @@ class Privileges
         }
     }
 
-    /**
-     * Get HTML snippet for privileges table head
-     *
-     * @return string
-     */
-    public function getHtmlForPrivsTableHead()
-    {
-        return '<thead>'
-            . '<tr>'
-            . '<th></th>'
-            . '<th>' . __('User name') . '</th>'
-            . '<th>' . __('Host name') . '</th>'
-            . '<th>' . __('Type') . '</th>'
-            . '<th>' . __('Privileges') . '</th>'
-            . '<th>' . __('Grant') . '</th>'
-            . '<th colspan="2">' . __('Action') . '</th>'
-            . '</tr>'
-            . '</thead>';
-    }
-
     /**
      * Get HTML error for View Users form
      * For non superusers such as grant/create users
diff --git a/templates/server/privileges/table.twig b/templates/server/privileges/table.twig
new file mode 100644
index 0000000000..4c328cff3c
--- /dev/null
+++ b/templates/server/privileges/table.twig
@@ -0,0 +1,61 @@
+{% if is_superuser %}
+  <form id="usersForm" action="{{ url('/server/privileges') }}">
+    {{ get_hidden_inputs(db, table) }}
+
+    <fieldset>
+      <legend>
+        {{ get_icon('b_usrcheck') }}
+        {{ 'Users having access to "%s"'|trans|format('<a href="' ~ table_url ~ get_common({
+          'db': db,
+          'table': table
+        }, '&') ~ '">' ~ db ~ '.' ~ table ~ '</a>')|raw }}
+      </legend>
+
+      <div class="responsivetable jsresponsive">
+        <table id="tablespecificuserrights" class="data">
+          <thead>
+            <tr>
+              <th></th>
+              <th>{% trans 'User name' %}</th>
+              <th>{% trans 'Host name' %}</th>
+              <th>{% trans 'Type' %}</th>
+              <th>{% trans 'Privileges' %}</th>
+              <th>{% trans 'Grant' %}</th>
+              <th colspan="2">{% trans 'Action' %}</th>
+            </tr>
+          </thead>
+
+          {{ table_body|raw }}
+        </table>
+      </div>
+
+      <div class="floatleft">
+        <img class="selectallarrow" src="{{ pma_theme_image }}arrow_{{ text_dir }}.png" alt="
+            {%- trans 'With selected:' %}" width="38" height="22">
+        <input type="checkbox" id="usersForm_checkall" class="checkall_box" title="{% trans 'Check all' %}">
+        <label for="usersForm_checkall">{% trans 'Check all' %}</label>
+        <em class="with-selected">{% trans 'With selected:' %}</em>
+        {{ get_button_or_image('submit_mult', 'mult_submit', 'Export'|trans, 'b_tblexport', 'export') }}
+      </div>
+    </fieldset>
+  </form>
+{% else %}
+  {{ 'Not enough privilege to view users.'|trans|error }}
+{% endif %}
+
+{% if is_createuser %}
+  <div class="row">
+    <div class="col-12">
+      <fieldset id="fieldset_add_user">
+        <legend>{% trans %}New{% context %}Create new user{% endtrans %}</legend>
+        <a id="add_user_anchor" href="{{ url('/server/privileges', {
+          'adduser': true,
+          'dbname': db,
+          'tablename': table
+        }) }}" rel="{{ get_common({'checkprivsdb': db, 'checkprivstable': table}) }}">
+          {{ get_icon('b_usradd', 'Add user account'|trans) }}
+        </a>
+      </fieldset>
+    </div>
+  </div>
+{% endif %}