diff --git a/models/ssh_key.go b/models/ssh_key.go
index a7b1680f6..325a40a48 100644
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -165,6 +165,9 @@ func CheckPublicKeyString(content string) (_ string, err error) {
 		return "", errors.New("only a single line with a single key please")
 	}
 
+	// remove any unnecessary whitespace now
+	content = strings.TrimSpace(content)
+
 	fields := strings.Fields(content)
 	if len(fields) < 2 {
 		return "", errors.New("too less fields")
@@ -374,6 +377,11 @@ func rewriteAuthorizedKeys(key *PublicKey, p, tmpP string) error {
 			break
 		}
 	}
+
+	if !isFound {
+		log.Warn("SSH key %d not found in authorized_keys file for deletion", key.ID)
+	}
+
 	return nil
 }