diff --git a/site/plugins/admin/app/Controllers/ApiController.php b/site/plugins/admin/app/Controllers/ApiController.php
index 1cd0521f..56d0767c 100644
--- a/site/plugins/admin/app/Controllers/ApiController.php
+++ b/site/plugins/admin/app/Controllers/ApiController.php
@@ -251,7 +251,7 @@ class ApiController extends Controller
             $this->flash->addMessage('error', __('admin_message_' . $post_data['api'] . '_api_token_was_not_updated'));
         }
 
-        return $response->withRedirect($this->router->pathFor('admin.api_tokens.index') . '?api=' . $data['api']);
+        return $response->withRedirect($this->router->pathFor('admin.api_tokens.index') . '?api=' . $post_data['api']);
     }
 
     /**
diff --git a/site/plugins/admin/routes/web.php b/site/plugins/admin/routes/web.php
index 2bc2fcf4..bf9f7378 100644
--- a/site/plugins/admin/routes/web.php
+++ b/site/plugins/admin/routes/web.php
@@ -103,7 +103,7 @@ $app->group('/' . $admin_route, function () use ($app) : void {
     $app->get('/api/tokens/add', 'ApiController:add')->setName('admin.api_tokens.add');
     $app->post('/api/tokens/add', 'ApiController:addProcess')->setName('admin.api_tokens.addProcess');
     $app->get('/api/tokens/edit', 'ApiController:edit')->setName('admin.api_tokens.edit');
-    $app->post('/api/tokens/edit', 'ApiController:editProсess')->setName('admin.api_tokens.addProcess');
+    $app->post('/api/tokens/edit', 'ApiController:editProcess')->setName('admin.api_tokens.editProcess');
     $app->post('/api/tokens/delete', 'ApiController:deleteProcess')->setName('admin.api_tokens.deleteProcess');
 
 })->add(new AuthMiddleware($flextype));
diff --git a/site/plugins/admin/templates/system/api/delivery/edit.html b/site/plugins/admin/templates/system/api/delivery/edit.html
index 6923cb82..61e92bfd 100644
--- a/site/plugins/admin/templates/system/api/delivery/edit.html
+++ b/site/plugins/admin/templates/system/api/delivery/edit.html
@@ -34,7 +34,7 @@
                 </select>
             </div>
             <div class="form-group">
-                <input type="submit" id="create" name="create" value="{{ tr('admin_create') }}" class="btn btn-black">
+                <input type="submit" id="save" name="save" value="{{ tr('admin_save') }}" class="btn btn-black">
             </div>
         </div>
     </div>
diff --git a/site/plugins/admin/templates/system/api/delivery/index.html b/site/plugins/admin/templates/system/api/delivery/index.html
index 8d6de98b..9254b040 100644
--- a/site/plugins/admin/templates/system/api/delivery/index.html
+++ b/site/plugins/admin/templates/system/api/delivery/index.html
@@ -10,12 +10,12 @@
           {% set token_data = parser_decode(filesystem_read(token_file_path), 'yaml') %}
       {% endif %}
       <tr>
-          <td style="width: 50px; padding-right: 10px; text-align:center;">
+          <td style="width: 50px; padding-right: 10px; text-align:center;" class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">
             <i class="fas fa-truck"></i>
           </td>
-          <td style="padding-left:0px;"><a href="{{ path_for('admin.api_tokens.edit') }}?api={{ api }}&api_token={{ delivery_token.dirname }}">{{ token_data.title }}</a></td>
-          <td style="padding-left:0px;">{{ delivery_token.dirname }}</td>
-          <td style="padding-left:0px;">{{ token_data.calls }} / {% if(token_data.limit_calls > 0) %}{{ token_data.limit_calls }}{% else %}<span style="font-size: 20px;">&infin;</span>{% endif %}</td>
+          <td style="padding-left:0px;" class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}"><a href="{{ path_for('admin.api_tokens.edit') }}?api={{ api }}&api_token={{ delivery_token.dirname }}">{{ token_data.title }}</a></td>
+          <td style="padding-left:0px;" class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ delivery_token.dirname }}</td>
+          <td style="padding-left:0px;" class="{% if token_data.state == 'disabled' %}opacity-50{% endif %}">{{ token_data.calls }} / {% if(token_data.limit_calls > 0) %}{{ token_data.limit_calls }}{% else %}<span style="font-size: 20px;">&infin;</span>{% endif %}</td>
           <td class="text-right">
               <div class="btn-group">
                 <button type="button" class="btn dot dropdown-toggle" data-toggle="dropdown" data-display="static" aria-haspopup="true" aria-expanded="false">