diff --git a/db/sql/SqlDb.go b/db/sql/SqlDb.go
index 152764340..78598e9fe 100644
--- a/db/sql/SqlDb.go
+++ b/db/sql/SqlDb.go
@@ -61,16 +61,6 @@ func validateMutationResult(res sql.Result, err error) error {
 		return err
 	}
 
-	affected, err := res.RowsAffected()
-
-	if err != nil {
-		return err
-	}
-
-	if affected == 0 {
-		return db.ErrNotFound
-	}
-
 	return nil
 }
 
diff --git a/db/sql/session.go b/db/sql/session.go
index d1098e945..f8baf7430 100644
--- a/db/sql/session.go
+++ b/db/sql/session.go
@@ -27,10 +27,8 @@ func (d *SqlDb) GetAPIToken(tokenID string) (token db.APIToken, err error) {
 	return
 }
 
-func (d *SqlDb) ExpireAPIToken(userID int, tokenID string) (err error) {
-	res, err := d.exec("update user__token set expired=true where id=? and user_id=?", tokenID, userID)
-
-	return validateMutationResult(res, err)
+func (d *SqlDb) ExpireAPIToken(userID int, tokenID string) error {
+	return validateMutationResult(d.exec("update user__token set expired=true where id=? and user_id=?", tokenID, userID))
 }
 
 func (d *SqlDb) DeleteAPIToken(userID int, tokenID string) (err error) {
diff --git a/web/src/components/KeyForm.vue b/web/src/components/KeyForm.vue
index 5b8751f13..36ea5e528 100644
--- a/web/src/components/KeyForm.vue
+++ b/web/src/components/KeyForm.vue
@@ -73,7 +73,7 @@
       v-model="item.ssh.private_key"
       :label="$t('privateKey')"
       :disabled="formSaving || !canEditSecrets"
-      :rules="[v => !!v || $t('private_key_required')]"
+      :rules="[v => !canEditSecrets || !!v || $t('private_key_required')]"
       v-if="item.type === 'ssh'"
     />