diff --git a/internal/processing/user/emailconfirm.go b/internal/processing/user/emailconfirm.go
index f3b7ab089..1f9cb0a10 100644
--- a/internal/processing/user/emailconfirm.go
+++ b/internal/processing/user/emailconfirm.go
@@ -114,7 +114,7 @@ func (p *processor) ConfirmEmail(ctx context.Context, token string) (*gtsmodel.U
 	}
 
 	if user.ConfirmationSentAt.Before(time.Now().Add(-oneWeek)) {
-		return nil, gtserror.NewErrorForbidden(errors.New("confirmation token more than a week old, please request a new one"))
+		return nil, gtserror.NewErrorForbidden(errors.New("ConfirmEmail: confirmation token expired"))
 	}
 
 	// mark the user's email address as confirmed + remove the unconfirmed address and the token
diff --git a/internal/processing/user/emailconfirm_test.go b/internal/processing/user/emailconfirm_test.go
index f269f4db4..826f585cd 100644
--- a/internal/processing/user/emailconfirm_test.go
+++ b/internal/processing/user/emailconfirm_test.go
@@ -106,7 +106,7 @@ func (suite *EmailConfirmTestSuite) TestConfirmEmailOldToken() {
 	// confirm with the token set above
 	updatedUser, errWithCode := suite.user.ConfirmEmail(ctx, "1d1aa44b-afa4-49c8-ac4b-eceb61715cc6")
 	suite.Nil(updatedUser)
-	suite.EqualError(errWithCode, "confirmation token more than a week old, please request a new one")
+	suite.EqualError(errWithCode, "ConfirmEmail: confirmation token expired")
 }
 
 func TestEmailConfirmTestSuite(t *testing.T) {