diff --git a/src/main/resources/static/gr-serviceuser-create.html b/src/main/resources/static/gr-serviceuser-create.html
index b6b71fe..57bdcda 100644
--- a/src/main/resources/static/gr-serviceuser-create.html
+++ b/src/main/resources/static/gr-serviceuser-create.html
@@ -68,7 +68,7 @@
         </section>
       </fieldset>
       <gr-button id="createButton"
-                 on-tap="_handleCreateServiceUser"
+                 on-click="_handleCreateServiceUser"
                  disabled="[[!_enableButton]]">
         Create
       </gr-button>
diff --git a/src/main/resources/static/gr-serviceuser-detail.html b/src/main/resources/static/gr-serviceuser-detail.html
index 8dedf23..25bc29f 100644
--- a/src/main/resources/static/gr-serviceuser-detail.html
+++ b/src/main/resources/static/gr-serviceuser-detail.html
@@ -74,7 +74,7 @@
                     [[_active(_serviceUser)]]
                   </span>
                 </section>
-                <gr-button id="statusToggleButton" on-tap="_toggleStatus" disabled="[[_loading]]">
+                <gr-button id="statusToggleButton" on-click="_toggleStatus" disabled="[[_loading]]">
                   [[_statusButtonText]]</gr-button>
               </fieldset>
               <fieldset>
@@ -110,7 +110,7 @@
                 <p id="ownerChangeWarning" class="style-scope gr-settings-view" hidden$="[[!_newOwner]]">
                   [[_ownerChangeWarning]]
                 </p>
-                <gr-button id="savePrefs" on-tap="_handleSavePreferences" disabled="[[!_prefsChanged]]">
+                <gr-button id="savePrefs" on-click="_handleSavePreferences" disabled="[[!_prefsChanged]]">
                   Save changes
                 </gr-button>
               </fieldset>
diff --git a/src/main/resources/static/gr-serviceuser-http-password.html b/src/main/resources/static/gr-serviceuser-http-password.html
index f2f5b3e..8cebbe5 100644
--- a/src/main/resources/static/gr-serviceuser-http-password.html
+++ b/src/main/resources/static/gr-serviceuser-http-password.html
@@ -54,9 +54,9 @@
           <span class="value">[[_serviceUser.username]]</span>
         </section>
         <gr-button id="generateButton"
-                   on-tap="_handleGenerateTap">Generate new password</gr-button>
+                   on-click="_handleGenerateTap">Generate new password</gr-button>
         <gr-button id="deleteButton"
-                   on-tap="_handleDelete">Delete password</gr-button>
+                   on-click="_handleDelete">Delete password</gr-button>
       </div>
     </div>
     <gr-overlay id="generatedPasswordOverlay"
@@ -73,7 +73,7 @@
         </section>
         <gr-button link
                    class="closeButton"
-                   on-tap="_closeOverlay">Close</gr-button>
+                   on-click="_closeOverlay">Close</gr-button>
       </div>
     </gr-overlay>
   </template>
diff --git a/src/main/resources/static/gr-serviceuser-list.html b/src/main/resources/static/gr-serviceuser-list.html
index 052e9f4..e927d63 100644
--- a/src/main/resources/static/gr-serviceuser-list.html
+++ b/src/main/resources/static/gr-serviceuser-list.html
@@ -42,7 +42,7 @@
         <gr-button primary
                    link
                    id="createNew"
-                   on-tap="_createNewServiceUser">
+                   on-click="_createNewServiceUser">
           Create New
         </gr-button>
       </div>
diff --git a/src/main/resources/static/gr-serviceuser-ssh-panel.html b/src/main/resources/static/gr-serviceuser-ssh-panel.html
index b7ed896..2906a10 100644
--- a/src/main/resources/static/gr-serviceuser-ssh-panel.html
+++ b/src/main/resources/static/gr-serviceuser-ssh-panel.html
@@ -74,14 +74,14 @@
                 <td>[[_getStatusLabel(key.valid)]]</td>
                 <td>
                   <gr-button link
-                             on-tap="_showKey"
+                             on-click="_showKey"
                              data-index$="[[index]]"
                              link>Click to View</gr-button>
                 </td>
                 <td>
                   <gr-button link
                              data-index$="[[index]]"
-                             on-tap="_handleDeleteKey">Delete</gr-button>
+                             on-click="_handleDeleteKey">Delete</gr-button>
                 </td>
               </tr>
             </template>
@@ -104,7 +104,7 @@
             </section>
           </fieldset>
           <gr-button class="closeButton"
-                     on-tap="_closeOverlay">Close</gr-button>
+                     on-click="_closeOverlay">Close</gr-button>
         </gr-overlay>
       </fieldset>
       <fieldset>
@@ -121,7 +121,7 @@
         <gr-button id="addButton"
                    link
                    disabled$="[[_computeAddButtonDisabled(_newKey)]]"
-                   on-tap="_handleAddKey">
+                   on-click="_handleAddKey">
           Add new SSH key
         </gr-button>
       </fieldset>