diff --git a/appview/db/email.go b/appview/db/email.go
index b4ee28e8..9fa2733e 100644
--- a/appview/db/email.go
+++ b/appview/db/email.go
@@ -24,7 +24,7 @@ func GetPrimaryEmail(e Execer, did string) (Email, error) {
 	`
 	var email Email
 	var createdStr string
-	var lastSent *string
+	var lastSent string
 	err := e.QueryRow(query, did).Scan(&email.ID, &email.Did, &email.Address, &email.Verified, &email.Primary, &email.VerificationCode, &lastSent, &createdStr)
 	if err != nil {
 		return Email{}, err
@@ -33,13 +33,11 @@ func GetPrimaryEmail(e Execer, did string) (Email, error) {
 	if err != nil {
 		return Email{}, err
 	}
-	if lastSent != nil {
-		parsedTime, err := time.Parse(time.RFC3339, *lastSent)
-		if err != nil {
-			return Email{}, err
-		}
-		email.LastSent = &parsedTime
+	parsedTime, err := time.Parse(time.RFC3339, lastSent)
+	if err != nil {
+		return Email{}, err
 	}
+	email.LastSent = &parsedTime
 	return email, nil
 }
 
@@ -51,7 +49,7 @@ func GetEmail(e Execer, did string, em string) (Email, error) {
 	`
 	var email Email
 	var createdStr string
-	var lastSent *string
+	var lastSent string
 	err := e.QueryRow(query, did, em).Scan(&email.ID, &email.Did, &email.Address, &email.Verified, &email.Primary, &email.VerificationCode, &lastSent, &createdStr)
 	if err != nil {
 		return Email{}, err
@@ -60,13 +58,11 @@ func GetEmail(e Execer, did string, em string) (Email, error) {
 	if err != nil {
 		return Email{}, err
 	}
-	if lastSent != nil {
-		parsedTime, err := time.Parse(time.RFC3339, *lastSent)
-		if err != nil {
-			return Email{}, err
-		}
-		email.LastSent = &parsedTime
+	parsedTime, err := time.Parse(time.RFC3339, lastSent)
+	if err != nil {
+		return Email{}, err
 	}
+	email.LastSent = &parsedTime
 	return email, nil
 }
 
@@ -260,7 +256,7 @@ func GetAllEmails(e Execer, did string) ([]Email, error) {
 	for rows.Next() {
 		var email Email
 		var createdStr string
-		var lastSent *string
+		var lastSent string
 		err := rows.Scan(&email.Did, &email.Address, &email.Verified, &email.Primary, &email.VerificationCode, &lastSent, &createdStr)
 		if err != nil {
 			return nil, err
@@ -269,13 +265,11 @@ func GetAllEmails(e Execer, did string) ([]Email, error) {
 		if err != nil {
 			return nil, err
 		}
-		if lastSent != nil {
-			parsedTime, err := time.Parse(time.RFC3339, *lastSent)
-			if err != nil {
-				return nil, err
-			}
-			email.LastSent = &parsedTime
+		parsedTime, err := time.Parse(time.RFC3339, lastSent)
+		if err != nil {
+			return nil, err
 		}
+		email.LastSent = &parsedTime
 		emails = append(emails, email)
 	}
 	return emails, nil
@@ -284,19 +278,10 @@ func GetAllEmails(e Execer, did string) ([]Email, error) {
 func UpdateVerificationCode(e Execer, did string, email string, code string) error {
 	query := `
 		update emails
-		set verification_code = ?
+		set verification_code = ?,
+			last_sent = strftime('%Y-%m-%dT%H:%M:%SZ', 'now')
 		where did = ? and email = ?
 	`
 	_, err := e.Exec(query, code, did, email)
 	return err
 }
-
-func UpdateLastSent(e Execer, did string, email string, lastSent time.Time) error {
-	query := `
-		update emails
-		set last_sent = ?
-		where did = ? and email = ?
-	`
-	_, err := e.Exec(query, lastSent.Format(time.RFC3339), did, email)
-	return err
-}
diff --git a/appview/pages/templates/settings.html b/appview/pages/templates/settings.html
index 82eed911..bd71da3d 100644
--- a/appview/pages/templates/settings.html
+++ b/appview/pages/templates/settings.html
@@ -108,7 +108,7 @@
       </div>
       <div class="flex gap-2 items-center">
         {{ if not .Verified }}
-        <a 
+        <button
           class="btn flex gap-2"
           hx-post="/settings/emails/verify/resend" 
           hx-swap="none"
@@ -116,7 +116,7 @@
           hx-vals='{"email": "{{ .Address }}"}'>
           <i class="w-5 h-5" data-lucide="rotate-cw"></i>
           <span class="hidden md:inline">resend</span> 
-        </a>
+        </button>
         {{ end }}
         {{ if and (not .Primary) .Verified }}
         <a