diff --git a/app/views/admin/api_users/_form.html.erb b/app/views/admin/api_users/_form.html.erb
index 5fe0dae75..6119bc727 100644
--- a/app/views/admin/api_users/_form.html.erb
+++ b/app/views/admin/api_users/_form.html.erb
@@ -1,5 +1,5 @@
 <%= form_for([:admin, @api_user.registrar, @api_user], html: { class: 'form-horizontal', autocomplete: 'off' }) do |f| %>
-    <%= render 'shared/full_errors', object: @api_user %>
+    <%= render 'form_errors', target: @api_user %>
 
     <div class="row">
         <div class="col-md-8">
@@ -48,12 +48,11 @@
         </div>
     </div>
 
-    <hr/>
+    <hr>
 
     <div class="row">
         <div class="col-md-8 text-right">
-            <%= button_tag(t(:save), class: 'btn btn-primary') %>
+            <%= button_tag t(".#{f.object.new_record? ? 'create' : 'update'}_btn"), class: 'btn btn-success' %>
         </div>
     </div>
-
 <% end %>
diff --git a/app/views/admin/api_users/show.html.erb b/app/views/admin/api_users/show.html.erb
index 1c7c9941b..5022bc58b 100644
--- a/app/views/admin/api_users/show.html.erb
+++ b/app/views/admin/api_users/show.html.erb
@@ -14,12 +14,12 @@
         <div class="col-sm-4 text-right">
             <%= link_to t('.edit_btn'), edit_admin_registrar_api_user_path(@api_user.registrar,
                                                                            @api_user),
-                        class: 'btn btn-default' %>
+                        class: 'btn btn-primary' %>
             <%= link_to t('.delete_btn'), admin_registrar_api_user_path(@api_user.registrar,
                                                                         @api_user),
                         method: :delete,
                         data: { confirm: t(:are_you_sure) },
-                        class: 'btn btn-danger' %>
+                        class: 'btn btn-default' %>
         </div>
     </div>
 </div>
diff --git a/config/locales/admin/api_users.en.yml b/config/locales/admin/api_users.en.yml
index 245b0e4d7..0c8e6273c 100644
--- a/config/locales/admin/api_users.en.yml
+++ b/config/locales/admin/api_users.en.yml
@@ -19,3 +19,5 @@ en:
 
       form:
         active: Active
+        create_btn: Create API user
+        update_btn: Update API user
diff --git a/test/system/admin_area/registrars/api_users_test.rb b/test/system/admin_area/registrars/api_users_test.rb
index 69288265f..054261c71 100644
--- a/test/system/admin_area/registrars/api_users_test.rb
+++ b/test/system/admin_area/registrars/api_users_test.rb
@@ -14,7 +14,7 @@ class AdminRegistrarsApiUsersSystemTest < ApplicationSystemTestCase
 
     fill_in 'Username', with: username
     fill_in 'Password', with: valid_password
-    click_on 'Save'
+    click_on 'Create API user'
 
     assert_text 'Record created'
     assert_text "Username #{username}"
@@ -43,7 +43,7 @@ class AdminRegistrarsApiUsersSystemTest < ApplicationSystemTestCase
     visit admin_registrar_api_user_path(api_user.registrar, api_user)
     click_link_or_button 'Edit'
     fill_in 'Username', with: new_username
-    click_link_or_button 'Save'
+    click_link_or_button 'Update API user'
 
     assert_text 'Record updated'
     assert_text "Username #{new_username}"