diff --git a/client/res/templates/fields/email/edit.tpl b/client/res/templates/fields/email/edit.tpl
index b54637380e..46b005128d 100644
--- a/client/res/templates/fields/email/edit.tpl
+++ b/client/res/templates/fields/email/edit.tpl
@@ -12,7 +12,6 @@
             <button
                 class="btn btn-default btn-icon email-property{{#if primary}} active{{/if}} hidden"
                 type="button"
-                tabindex="-1"
                 data-action="switchEmailProperty"
                 data-property-type="primary"
                 data-toggle="tooltip"
@@ -24,7 +23,6 @@
             <button
                 class="btn btn-default btn-icon email-property{{#if optOut}} active{{/if}}"
                 type="button"
-                tabindex="-1"
                 data-action="switchEmailProperty"
                 data-property-type="optOut"
                 data-toggle="tooltip"
@@ -36,7 +34,6 @@
             <button
                 class="btn btn-default btn-icon radius-right email-property{{#if invalid}} active{{/if}}"
                 type="button"
-                tabindex="-1"
                 data-action="switchEmailProperty"
                 data-property-type="invalid"
                 data-toggle="tooltip"
@@ -50,7 +47,6 @@
                 type="button"
                 tabindex="-1"
                 data-action="removeEmailAddress"
-                data-property-type="invalid"
                 data-toggle="tooltip"
                 data-placement="top"
                 title="{{translate 'Remove'}}"
diff --git a/client/res/templates/fields/phone/edit.tpl b/client/res/templates/fields/phone/edit.tpl
index 0d5a5adb53..00eab75734 100644
--- a/client/res/templates/fields/phone/edit.tpl
+++ b/client/res/templates/fields/phone/edit.tpl
@@ -19,7 +19,6 @@
             <button
                 class="btn btn-default btn-icon phone-property{{#if primary}} active{{/if}} hidden"
                 type="button"
-                tabindex="-1"
                 data-action="switchPhoneProperty"
                 data-property-type="primary"
                 data-toggle="tooltip"
@@ -31,7 +30,6 @@
             <button
                 class="btn btn-default btn-icon phone-property{{#if optOut}} active{{/if}}"
                 type="button"
-                tabindex="-1"
                 data-action="switchPhoneProperty"
                 data-property-type="optOut"
                 data-toggle="tooltip"
@@ -43,7 +41,6 @@
             <button
                 class="btn btn-default btn-icon radius-right phone-property{{#if invalid}} active{{/if}}"
                 type="button"
-                tabindex="-1"
                 data-action="switchPhoneProperty"
                 data-property-type="invalid"
                 data-toggle="tooltip"
@@ -57,7 +54,6 @@
                 type="button"
                 tabindex="-1"
                 data-action="removePhoneNumber"
-                data-property-type="invalid"
                 data-toggle="tooltip"
                 data-placement="top"
                 title="{{translate 'Remove'}}"