diff --git a/pkg/modules/auth/openid/openid.go b/pkg/modules/auth/openid/openid.go
index 8f585e868..ac9d435c6 100644
--- a/pkg/modules/auth/openid/openid.go
+++ b/pkg/modules/auth/openid/openid.go
@@ -101,7 +101,7 @@ func HandleCallback(c echo.Context) error {
 	log.Debugf("Provider: %v", provider)
 	if err != nil {
 		log.Error(err)
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	if provider == nil {
 		return c.JSON(http.StatusBadRequest, models.Message{Message: "Provider does not exist"})
@@ -119,7 +119,7 @@ func HandleCallback(c echo.Context) error {
 			details := make(map[string]interface{})
 			if err := json.Unmarshal(rerr.Body, &details); err != nil {
 				log.Errorf("Error unmarshalling token for provider %s: %v", provider.Name, err)
-				return handler.HandleHTTPError(err, c)
+				return handler.HandleHTTPError(err)
 			}
 
 			return c.JSON(http.StatusBadRequest, map[string]interface{}{
@@ -128,7 +128,7 @@ func HandleCallback(c echo.Context) error {
 			})
 		}
 
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Extract the ID Token from OAuth2 token.
@@ -143,7 +143,7 @@ func HandleCallback(c echo.Context) error {
 	idToken, err := verifier.Verify(context.Background(), rawIDToken)
 	if err != nil {
 		log.Errorf("Error verifying token for provider %s: %v", provider.Name, err)
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Extract custom claims
@@ -152,21 +152,21 @@ func HandleCallback(c echo.Context) error {
 	err = idToken.Claims(cl)
 	if err != nil {
 		log.Errorf("Error getting token claims for provider %s: %v", provider.Name, err)
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if cl.Email == "" || cl.Name == "" || cl.PreferredUsername == "" {
 		info, err := provider.openIDProvider.UserInfo(context.Background(), provider.Oauth2Config.TokenSource(context.Background(), oauth2Token))
 		if err != nil {
 			log.Errorf("Error getting userinfo for provider %s: %v", provider.Name, err)
-			return handler.HandleHTTPError(err, c)
+			return handler.HandleHTTPError(err)
 		}
 
 		cl2 := &claims{}
 		err = info.Claims(cl2)
 		if err != nil {
 			log.Errorf("Error parsing userinfo claims for provider %s: %v", provider.Name, err)
-			return handler.HandleHTTPError(err, c)
+			return handler.HandleHTTPError(err)
 		}
 
 		if cl.Email == "" {
@@ -187,7 +187,7 @@ func HandleCallback(c echo.Context) error {
 
 		if cl.Email == "" {
 			log.Errorf("Claim does not contain an email address for provider %s", provider.Name)
-			return handler.HandleHTTPError(&user.ErrNoOpenIDEmailProvided{}, c)
+			return handler.HandleHTTPError(&user.ErrNoOpenIDEmailProvided{})
 		}
 	}
 
@@ -199,7 +199,7 @@ func HandleCallback(c echo.Context) error {
 	if err != nil {
 		_ = s.Rollback()
 		log.Errorf("Error creating new user for provider %s: %v", provider.Name, err)
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// does the oidc token contain well formed "vikunja_groups" through vikunja_scope
@@ -229,7 +229,7 @@ func HandleCallback(c echo.Context) error {
 	if err != nil {
 		_ = s.Rollback()
 		log.Errorf("Error creating new team for provider %s: %v", provider.Name, err)
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	// Create token
 	return auth.NewUserAuthTokenResponse(u, c, false)
diff --git a/pkg/modules/background/handler/background.go b/pkg/modules/background/handler/background.go
index 7d2950a50..d7bdbe8db 100644
--- a/pkg/modules/background/handler/background.go
+++ b/pkg/modules/background/handler/background.go
@@ -129,7 +129,7 @@ func (bp *BackgroundProvider) SetBackground(c echo.Context) error {
 	project, auth, err := bp.setBackgroundPreparations(s, c)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	p := bp.Provider()
@@ -144,13 +144,13 @@ func (bp *BackgroundProvider) SetBackground(c echo.Context) error {
 	err = p.Set(s, image, project, auth)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = project.ReadOne(s, auth)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, project)
@@ -176,7 +176,7 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
 	project, auth, err := bp.setBackgroundPreparations(s, c)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Get + upload the image
@@ -196,7 +196,7 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
 	mime, err := mimetype.DetectReader(srcf)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	if !strings.HasPrefix(mime.String(), "image") {
 		_ = s.Rollback()
@@ -210,18 +210,18 @@ func (bp *BackgroundProvider) UploadBackground(c echo.Context) error {
 			return echo.ErrBadRequest
 		}
 
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = project.ReadOne(s, auth)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, project)
@@ -287,7 +287,7 @@ func checkProjectBackgroundRights(s *xorm.Session, c echo.Context) (project *mod
 	can, _, err := project.CanRead(s, auth)
 	if err != nil {
 		_ = s.Rollback()
-		return nil, auth, handler.HandleHTTPError(err, c)
+		return nil, auth, handler.HandleHTTPError(err)
 	}
 	if !can {
 		_ = s.Rollback()
@@ -332,12 +332,12 @@ func GetProjectBackground(c echo.Context) error {
 	}
 	if err := bgFile.LoadFileByID(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	stat, err := bgFile.File.Stat()
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Unsplash requires pingbacks as per their api usage guidelines.
@@ -347,7 +347,7 @@ func GetProjectBackground(c echo.Context) error {
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Set Last-Modified header if we have the file stat, so clients can decide whether to use cached files
diff --git a/pkg/modules/background/unsplash/proxy.go b/pkg/modules/background/unsplash/proxy.go
index 7f0232a55..02dcca353 100644
--- a/pkg/modules/background/unsplash/proxy.go
+++ b/pkg/modules/background/unsplash/proxy.go
@@ -56,7 +56,7 @@ func unsplashImage(url string, c echo.Context) error {
 func ProxyUnsplashImage(c echo.Context) error {
 	photo, err := getUnsplashPhotoInfoByID(c.Param("image"))
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	pingbackByPhotoID(photo.ID)
 	return unsplashImage(photo.Urls.Raw, c)
@@ -76,7 +76,7 @@ func ProxyUnsplashImage(c echo.Context) error {
 func ProxyUnsplashThumb(c echo.Context) error {
 	photo, err := getUnsplashPhotoInfoByID(c.Param("image"))
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	pingbackByPhotoID(photo.ID)
 	return unsplashImage("https://images.unsplash.com/"+getImageID(photo.Urls.Raw)+"?ixlib=rb-1.2.1&q=80&fm=jpg&crop=entropy&cs=tinysrgb&w=200&fit=max&ixid=eyJhcHBfaWQiOjcyODAwfQ", c)
diff --git a/pkg/modules/migration/handler/common.go b/pkg/modules/migration/handler/common.go
index 222a5f826..3685050b9 100644
--- a/pkg/modules/migration/handler/common.go
+++ b/pkg/modules/migration/handler/common.go
@@ -28,12 +28,12 @@ import (
 func status(ms migration.MigratorName, c echo.Context) error {
 	user, err := user2.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	status, err := migration.GetMigrationStatus(ms, user)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, status)
diff --git a/pkg/modules/migration/handler/handler.go b/pkg/modules/migration/handler/handler.go
index 1e054738e..bf774b648 100644
--- a/pkg/modules/migration/handler/handler.go
+++ b/pkg/modules/migration/handler/handler.go
@@ -65,12 +65,12 @@ func (mw *MigrationWeb) Migrate(c echo.Context) error {
 	// Get the user from context
 	user, err := user2.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	stats, err := migration.GetMigrationStatus(ms, user)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if !stats.StartedAt.IsZero() && stats.FinishedAt.IsZero() {
@@ -92,7 +92,7 @@ func (mw *MigrationWeb) Migrate(c echo.Context) error {
 		User:         user,
 	})
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "Migration was started successfully."})
diff --git a/pkg/modules/migration/handler/handler_file.go b/pkg/modules/migration/handler/handler_file.go
index 541102366..d5e78b971 100644
--- a/pkg/modules/migration/handler/handler_file.go
+++ b/pkg/modules/migration/handler/handler_file.go
@@ -44,7 +44,7 @@ func (fw *FileMigratorWeb) Migrate(c echo.Context) error {
 	// Get the user from context
 	user, err := user2.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	file, err := c.FormFile("import")
@@ -59,18 +59,18 @@ func (fw *FileMigratorWeb) Migrate(c echo.Context) error {
 
 	m, err := migration.StartMigration(ms, user)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Do the migration
 	err = ms.Migrate(user, src, file.Size)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = migration.FinishMigration(m)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "Everything was migrated successfully."})
diff --git a/pkg/routes/api/v1/avatar.go b/pkg/routes/api/v1/avatar.go
index e70e099e2..fc536d314 100644
--- a/pkg/routes/api/v1/avatar.go
+++ b/pkg/routes/api/v1/avatar.go
@@ -66,7 +66,7 @@ func GetAvatar(c echo.Context) error {
 	u, err := user.GetUserWithEmail(s, &user.User{Username: username})
 	if err != nil && !user.IsErrUserDoesNotExist(err) {
 		log.Errorf("Error getting user for avatar: %v", err)
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	found := !(err != nil && user.IsErrUserDoesNotExist(err))
@@ -95,7 +95,7 @@ func GetAvatar(c echo.Context) error {
 		sizeInt, err = strconv.ParseInt(size, 10, 64)
 		if err != nil {
 			log.Errorf("Error parsing size: %v", err)
-			return handler.HandleHTTPError(err, c)
+			return handler.HandleHTTPError(err)
 		}
 	}
 	if sizeInt > config.ServiceMaxAvatarSize.GetInt64() {
@@ -106,7 +106,7 @@ func GetAvatar(c echo.Context) error {
 	a, mimeType, err := avatarProvider.GetAvatar(u, sizeInt)
 	if err != nil {
 		log.Errorf("Error getting avatar for user %d: %v", u.ID, err)
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.Blob(http.StatusOK, mimeType, a)
@@ -132,12 +132,12 @@ func UploadAvatar(c echo.Context) (err error) {
 
 	uc, err := user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	u, err := user.GetUserByID(s, uc.ID)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Get + upload the image
@@ -157,7 +157,7 @@ func UploadAvatar(c echo.Context) (err error) {
 	mime, err := mimetype.DetectReader(src)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	if !strings.HasPrefix(mime.String(), "image") {
 		return c.JSON(http.StatusBadRequest, models.Message{Message: "Uploaded file is no image."})
@@ -170,7 +170,7 @@ func UploadAvatar(c echo.Context) (err error) {
 		if err := f.Delete(); err != nil {
 			if !files.IsErrFileDoesNotExist(err) {
 				_ = s.Rollback()
-				return handler.HandleHTTPError(err, c)
+				return handler.HandleHTTPError(err)
 			}
 		}
 		u.AvatarFileID = 0
@@ -180,13 +180,13 @@ func UploadAvatar(c echo.Context) (err error) {
 	img, _, err := image.Decode(src)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	resizedImg := imaging.Resize(img, 0, 1024, imaging.Lanczos)
 	buf := &bytes.Buffer{}
 	if err := png.Encode(buf, resizedImg); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	upload.InvalidateCache(u)
@@ -199,7 +199,7 @@ func UploadAvatar(c echo.Context) (err error) {
 			return echo.ErrBadRequest
 		}
 
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	u.AvatarFileID = f.ID
@@ -207,12 +207,12 @@ func UploadAvatar(c echo.Context) (err error) {
 
 	if _, err := user.UpdateUser(s, u, false); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "Avatar was uploaded successfully."})
diff --git a/pkg/routes/api/v1/link_sharing_auth.go b/pkg/routes/api/v1/link_sharing_auth.go
index 484987663..266aecd83 100644
--- a/pkg/routes/api/v1/link_sharing_auth.go
+++ b/pkg/routes/api/v1/link_sharing_auth.go
@@ -56,7 +56,7 @@ func AuthenticateLinkShare(c echo.Context) error {
 	sh := &LinkShareAuth{}
 	err := c.Bind(sh)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -64,19 +64,19 @@ func AuthenticateLinkShare(c echo.Context) error {
 
 	share, err := models.GetLinkShareByHash(s, sh.Hash)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if share.SharingType == models.SharingTypeWithPassword {
 		err := models.VerifyLinkSharePassword(share, sh.Password)
 		if err != nil {
-			return handler.HandleHTTPError(err, c)
+			return handler.HandleHTTPError(err)
 		}
 	}
 
 	t, err := auth.NewLinkShareJWTAuthtoken(share)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	share.Password = ""
diff --git a/pkg/routes/api/v1/login.go b/pkg/routes/api/v1/login.go
index 3b27095ea..f968ce562 100644
--- a/pkg/routes/api/v1/login.go
+++ b/pkg/routes/api/v1/login.go
@@ -61,19 +61,19 @@ func Login(c echo.Context) error {
 
 	if user.Status == user2.StatusDisabled {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(&user2.ErrAccountDisabled{UserID: user.ID}, c)
+		return handler.HandleHTTPError(&user2.ErrAccountDisabled{UserID: user.ID})
 	}
 
 	totpEnabled, err := user2.TOTPEnabledForUser(s, user)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if totpEnabled {
 		if u.TOTPPasscode == "" {
 			_ = s.Rollback()
-			return handler.HandleHTTPError(user2.ErrInvalidTOTPPasscode{}, c)
+			return handler.HandleHTTPError(user2.ErrInvalidTOTPPasscode{})
 		}
 
 		_, err = user2.ValidateTOTPPasscode(s, &user2.TOTPPasscode{
@@ -85,7 +85,7 @@ func Login(c echo.Context) error {
 				user2.HandleFailedTOTPAuth(s, user)
 			}
 			_ = s.Rollback()
-			return handler.HandleHTTPError(err, c)
+			return handler.HandleHTTPError(err)
 		}
 	}
 
@@ -98,7 +98,7 @@ func Login(c echo.Context) error {
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Create token
@@ -129,12 +129,12 @@ func RenewToken(c echo.Context) (err error) {
 		err := share.ReadOne(s, share)
 		if err != nil {
 			_ = s.Rollback()
-			return handler.HandleHTTPError(err, c)
+			return handler.HandleHTTPError(err)
 		}
 		t, err := auth.NewLinkShareJWTAuthtoken(share)
 		if err != nil {
 			_ = s.Rollback()
-			return handler.HandleHTTPError(err, c)
+			return handler.HandleHTTPError(err)
 		}
 		return c.JSON(http.StatusOK, auth.Token{Token: t})
 	}
@@ -142,18 +142,18 @@ func RenewToken(c echo.Context) (err error) {
 	u, err := user2.GetUserFromClaims(claims)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	user, err := user2.GetUserWithEmail(s, &user2.User{ID: u.ID})
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	var long bool
diff --git a/pkg/routes/api/v1/task_attachment.go b/pkg/routes/api/v1/task_attachment.go
index 61a929633..6499cbb73 100644
--- a/pkg/routes/api/v1/task_attachment.go
+++ b/pkg/routes/api/v1/task_attachment.go
@@ -52,7 +52,7 @@ func UploadTaskAttachment(c echo.Context) error {
 	// Rights check
 	auth, err := auth2.GetAuthFromClaims(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -61,7 +61,7 @@ func UploadTaskAttachment(c echo.Context) error {
 	can, err := taskAttachment.CanCreate(s, auth)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	if !can {
 		return echo.ErrForbidden
@@ -71,7 +71,7 @@ func UploadTaskAttachment(c echo.Context) error {
 	form, err := c.MultipartForm()
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	type result struct {
@@ -88,14 +88,14 @@ func UploadTaskAttachment(c echo.Context) error {
 
 		f, err := file.Open()
 		if err != nil {
-			r.Errors = append(r.Errors, handler.HandleHTTPError(err, c))
+			r.Errors = append(r.Errors, handler.HandleHTTPError(err))
 			continue
 		}
 		defer f.Close()
 
 		err = ta.NewAttachment(s, f, file.Filename, uint64(file.Size), auth)
 		if err != nil {
-			r.Errors = append(r.Errors, handler.HandleHTTPError(err, c))
+			r.Errors = append(r.Errors, handler.HandleHTTPError(err))
 			continue
 		}
 		r.Success = append(r.Success, ta)
@@ -103,7 +103,7 @@ func UploadTaskAttachment(c echo.Context) error {
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, r)
@@ -132,7 +132,7 @@ func GetTaskAttachment(c echo.Context) error {
 	// Rights check
 	auth, err := auth2.GetAuthFromClaims(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -141,7 +141,7 @@ func GetTaskAttachment(c echo.Context) error {
 	can, _, err := taskAttachment.CanRead(s, auth)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	if !can {
 		return echo.ErrForbidden
@@ -151,19 +151,19 @@ func GetTaskAttachment(c echo.Context) error {
 	err = taskAttachment.ReadOne(s, auth)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Open an send the file to the client
 	err = taskAttachment.File.LoadFileByID()
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	http.ServeContent(c.Response(), c.Request(), taskAttachment.File.Name, taskAttachment.File.Created, taskAttachment.File.File)
diff --git a/pkg/routes/api/v1/user_caldav_token.go b/pkg/routes/api/v1/user_caldav_token.go
index bf751c57a..eb2a3dc53 100644
--- a/pkg/routes/api/v1/user_caldav_token.go
+++ b/pkg/routes/api/v1/user_caldav_token.go
@@ -43,12 +43,12 @@ func GenerateCaldavToken(c echo.Context) (err error) {
 
 	u, err := user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	token, err := user.GenerateNewCaldavToken(u)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusCreated, token)
@@ -69,12 +69,12 @@ func GenerateCaldavToken(c echo.Context) (err error) {
 func GetCaldavTokens(c echo.Context) error {
 	u, err := user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	tokens, err := user.GetCaldavTokens(u)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusCreated, tokens)
@@ -95,17 +95,17 @@ func GetCaldavTokens(c echo.Context) error {
 func DeleteCaldavToken(c echo.Context) error {
 	u, err := user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	id, err := strconv.ParseInt(c.Param("id"), 10, 64)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = user.DeleteCaldavTokenByID(u, id)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, &models.Message{Message: "The token was deleted successfully."})
diff --git a/pkg/routes/api/v1/user_confirm_email.go b/pkg/routes/api/v1/user_confirm_email.go
index 645366615..d73dab86b 100644
--- a/pkg/routes/api/v1/user_confirm_email.go
+++ b/pkg/routes/api/v1/user_confirm_email.go
@@ -51,12 +51,12 @@ func UserConfirmEmail(c echo.Context) error {
 	err := user.ConfirmEmail(s, &emailConfirm)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "The email was confirmed successfully."})
diff --git a/pkg/routes/api/v1/user_deletion.go b/pkg/routes/api/v1/user_deletion.go
index 311507112..5dcd7aa09 100644
--- a/pkg/routes/api/v1/user_deletion.go
+++ b/pkg/routes/api/v1/user_deletion.go
@@ -53,13 +53,13 @@ func UserRequestDeletion(c echo.Context) error {
 
 	err := s.Begin()
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	u, err := user.GetCurrentUserFromDB(s, c)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if u.IsLocalUser() {
@@ -76,20 +76,20 @@ func UserRequestDeletion(c echo.Context) error {
 		err = user.CheckUserPassword(u, deletionRequest.Password)
 		if err != nil {
 			_ = s.Rollback()
-			return handler.HandleHTTPError(err, c).SetInternal(err)
+			return handler.HandleHTTPError(err).SetInternal(err)
 		}
 	}
 
 	err = user.RequestDeletion(s, u)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = s.Commit()
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "Successfully requested deletion."})
@@ -122,25 +122,25 @@ func UserConfirmDeletion(c echo.Context) error {
 
 	err = s.Begin()
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	u, err := user.GetCurrentUserFromDB(s, c)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = user.ConfirmDeletion(s, u, deleteConfirmation.Token)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = s.Commit()
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusNoContent, models.Message{Message: "Successfully confirmed the deletion request."})
@@ -164,13 +164,13 @@ func UserCancelDeletion(c echo.Context) error {
 
 	err := s.Begin()
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	u, err := user.GetCurrentUserFromDB(s, c)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if u.IsLocalUser() {
@@ -187,20 +187,20 @@ func UserCancelDeletion(c echo.Context) error {
 		err = user.CheckUserPassword(u, deletionRequest.Password)
 		if err != nil {
 			_ = s.Rollback()
-			return handler.HandleHTTPError(err, c)
+			return handler.HandleHTTPError(err)
 		}
 	}
 
 	err = user.CancelDeletion(s, u)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = s.Commit()
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusNoContent, models.Message{Message: "Successfully confirmed the deletion request."})
diff --git a/pkg/routes/api/v1/user_export.go b/pkg/routes/api/v1/user_export.go
index a356ee7c0..444d8b269 100644
--- a/pkg/routes/api/v1/user_export.go
+++ b/pkg/routes/api/v1/user_export.go
@@ -35,13 +35,13 @@ func checkExportRequest(c echo.Context) (s *xorm.Session, u *user.User, err erro
 
 	err = s.Begin()
 	if err != nil {
-		return nil, nil, handler.HandleHTTPError(err, c)
+		return nil, nil, handler.HandleHTTPError(err)
 	}
 
 	u, err = user.GetCurrentUserFromDB(s, c)
 	if err != nil {
 		_ = s.Rollback()
-		return nil, nil, handler.HandleHTTPError(err, c)
+		return nil, nil, handler.HandleHTTPError(err)
 	}
 
 	// Users authenticated with a third-party are unable to provide their password.
@@ -62,7 +62,7 @@ func checkExportRequest(c echo.Context) (s *xorm.Session, u *user.User, err erro
 	err = user.CheckUserPassword(u, pass.Password)
 	if err != nil {
 		_ = s.Rollback()
-		return nil, nil, handler.HandleHTTPError(err, c)
+		return nil, nil, handler.HandleHTTPError(err)
 	}
 
 	return
@@ -90,13 +90,13 @@ func RequestUserDataExport(c echo.Context) error {
 	})
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = s.Commit()
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "Successfully requested data export. We will send you an email when it's ready."})
@@ -122,18 +122,18 @@ func DownloadUserDataExport(c echo.Context) error {
 	err = s.Commit()
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Download
 	exportFile := &files.File{ID: u.ExportFileID}
 	err = exportFile.LoadFileMetaByID()
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	err = exportFile.LoadFileByID()
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	http.ServeContent(c.Response(), c.Request(), exportFile.Name, exportFile.Created, exportFile.File)
diff --git a/pkg/routes/api/v1/user_list.go b/pkg/routes/api/v1/user_list.go
index 8296c3537..8842c4013 100644
--- a/pkg/routes/api/v1/user_list.go
+++ b/pkg/routes/api/v1/user_list.go
@@ -50,12 +50,12 @@ func UserList(c echo.Context) error {
 	users, err := user.ListUsers(s, search, nil)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Obfuscate the mailadresses
@@ -83,13 +83,13 @@ func UserList(c echo.Context) error {
 func ListUsersForProject(c echo.Context) error {
 	projectID, err := strconv.ParseInt(c.Param("project"), 10, 64)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	project := models.Project{ID: projectID}
 	auth, err := auth2.GetAuthFromClaims(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -98,7 +98,7 @@ func ListUsersForProject(c echo.Context) error {
 	canRead, _, err := project.CanRead(s, auth)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	if !canRead {
 		return echo.ErrForbidden
@@ -108,12 +108,12 @@ func ListUsersForProject(c echo.Context) error {
 	users, err := models.ListUsersFromProject(s, &project, search)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, users)
diff --git a/pkg/routes/api/v1/user_password_reset.go b/pkg/routes/api/v1/user_password_reset.go
index 597460364..27c3a94de 100644
--- a/pkg/routes/api/v1/user_password_reset.go
+++ b/pkg/routes/api/v1/user_password_reset.go
@@ -51,12 +51,12 @@ func UserResetPassword(c echo.Context) error {
 	err := user.ResetPassword(s, &pwReset)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "The password was updated successfully."})
@@ -90,12 +90,12 @@ func UserRequestResetPasswordToken(c echo.Context) error {
 	err := user.RequestUserPasswordResetTokenByEmail(s, &pwTokenReset)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "Token was sent."})
diff --git a/pkg/routes/api/v1/user_register.go b/pkg/routes/api/v1/user_register.go
index 5146f43f9..9f70d1921 100644
--- a/pkg/routes/api/v1/user_register.go
+++ b/pkg/routes/api/v1/user_register.go
@@ -55,7 +55,7 @@ func RegisterUser(c echo.Context) error {
 			return c.JSON(e.HTTPCode, e)
 		}
 
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 	if userIn == nil {
 		return c.JSON(http.StatusBadRequest, models.Message{Message: "No or invalid user model provided."})
@@ -68,19 +68,19 @@ func RegisterUser(c echo.Context) error {
 	newUser, err := user.CreateUser(s, userIn.APIFormat())
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Create their initial project
 	err = models.CreateNewProjectForUser(s, newUser)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, newUser)
diff --git a/pkg/routes/api/v1/user_settings.go b/pkg/routes/api/v1/user_settings.go
index 137d53b51..ffbe74004 100644
--- a/pkg/routes/api/v1/user_settings.go
+++ b/pkg/routes/api/v1/user_settings.go
@@ -78,7 +78,7 @@ func GetUserAvatarProvider(c echo.Context) error {
 
 	u, err := user2.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -87,12 +87,12 @@ func GetUserAvatarProvider(c echo.Context) error {
 	user, err := user2.GetUserWithEmail(s, &user2.User{ID: u.ID})
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	uap := &UserAvatarProvider{AvatarProvider: user.AvatarProvider}
@@ -121,7 +121,7 @@ func ChangeUserAvatarProvider(c echo.Context) error {
 
 	u, err := user2.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -130,7 +130,7 @@ func ChangeUserAvatarProvider(c echo.Context) error {
 	user, err := user2.GetUserWithEmail(s, &user2.User{ID: u.ID})
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	user.AvatarProvider = uap.AvatarProvider
@@ -138,12 +138,12 @@ func ChangeUserAvatarProvider(c echo.Context) error {
 	_, err = user2.UpdateUser(s, user, false)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, &models.Message{Message: "Avatar was changed successfully."})
@@ -178,7 +178,7 @@ func UpdateGeneralUserSettings(c echo.Context) error {
 
 	u, err := user2.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -187,7 +187,7 @@ func UpdateGeneralUserSettings(c echo.Context) error {
 	user, err := user2.GetUserWithEmail(s, &user2.User{ID: u.ID})
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	user.Name = us.Name
@@ -205,12 +205,12 @@ func UpdateGeneralUserSettings(c echo.Context) error {
 	_, err = user2.UpdateUser(s, user, true)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, &models.Message{Message: "The settings were updated successfully."})
diff --git a/pkg/routes/api/v1/user_show.go b/pkg/routes/api/v1/user_show.go
index 633d39670..500b481ca 100644
--- a/pkg/routes/api/v1/user_show.go
+++ b/pkg/routes/api/v1/user_show.go
@@ -60,7 +60,7 @@ func UserShow(c echo.Context) error {
 
 	u, err := models.GetUserOrLinkShareUser(s, a)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	us := &userWithSettings{
diff --git a/pkg/routes/api/v1/user_totp.go b/pkg/routes/api/v1/user_totp.go
index d7ac193b9..d7ef92517 100644
--- a/pkg/routes/api/v1/user_totp.go
+++ b/pkg/routes/api/v1/user_totp.go
@@ -47,7 +47,7 @@ import (
 func UserTOTPEnroll(c echo.Context) error {
 	u, err := user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -56,12 +56,12 @@ func UserTOTPEnroll(c echo.Context) error {
 	t, err := user.EnrollTOTP(s, u)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, t)
@@ -84,7 +84,7 @@ func UserTOTPEnroll(c echo.Context) error {
 func UserTOTPEnable(c echo.Context) error {
 	u, err := user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	passcode := &user.TOTPPasscode{
@@ -105,12 +105,12 @@ func UserTOTPEnable(c echo.Context) error {
 	err = user.EnableTOTP(s, passcode)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "TOTP was enabled successfully."})
@@ -142,7 +142,7 @@ func UserTOTPDisable(c echo.Context) error {
 
 	u, err := user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -151,24 +151,24 @@ func UserTOTPDisable(c echo.Context) error {
 	u, err = user.GetUserByID(s, u.ID)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = user.CheckUserPassword(u, login.Password)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = user.DisableTOTP(s, u)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "TOTP was enabled successfully."})
@@ -187,7 +187,7 @@ func UserTOTPDisable(c echo.Context) error {
 func UserTOTPQrCode(c echo.Context) error {
 	u, err := user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -196,19 +196,19 @@ func UserTOTPQrCode(c echo.Context) error {
 	qrcode, err := user.GetTOTPQrCodeForUser(s, u)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	buff := &bytes.Buffer{}
 	err = jpeg.Encode(buff, qrcode, nil)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.Blob(http.StatusOK, "image/jpeg", buff.Bytes())
@@ -227,7 +227,7 @@ func UserTOTPQrCode(c echo.Context) error {
 func UserTOTP(c echo.Context) error {
 	u, err := user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -236,12 +236,12 @@ func UserTOTP(c echo.Context) error {
 	t, err := user.GetTOTPForUser(s, u)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, t)
diff --git a/pkg/routes/api/v1/user_update_email.go b/pkg/routes/api/v1/user_update_email.go
index 121189ec3..703c375ea 100644
--- a/pkg/routes/api/v1/user_update_email.go
+++ b/pkg/routes/api/v1/user_update_email.go
@@ -57,7 +57,7 @@ func UpdateUserEmail(c echo.Context) (err error) {
 
 	emailUpdate.User, err = user.GetCurrentUser(c)
 	if err != nil {
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	s := db.NewSession()
@@ -69,18 +69,18 @@ func UpdateUserEmail(c echo.Context) (err error) {
 	})
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	err = user.UpdateEmail(s, emailUpdate)
 	if err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "We sent you email with a link to confirm your email address."})
diff --git a/pkg/routes/api/v1/user_update_password.go b/pkg/routes/api/v1/user_update_password.go
index 9ec18aa3d..640799d40 100644
--- a/pkg/routes/api/v1/user_update_password.go
+++ b/pkg/routes/api/v1/user_update_password.go
@@ -60,7 +60,7 @@ func UserChangePassword(c echo.Context) error {
 	}
 
 	if newPW.OldPassword == "" {
-		return handler.HandleHTTPError(user.ErrEmptyOldPassword{}, c)
+		return handler.HandleHTTPError(user.ErrEmptyOldPassword{})
 	}
 
 	s := db.NewSession()
@@ -69,18 +69,18 @@ func UserChangePassword(c echo.Context) error {
 	// Check the current password
 	if _, err = user.CheckUserCredentials(s, &user.Login{Username: doer.Username, Password: newPW.OldPassword}); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	// Update the password
 	if err = user.UpdateUserPassword(s, doer, newPW.NewPassword); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	if err := s.Commit(); err != nil {
 		_ = s.Rollback()
-		return handler.HandleHTTPError(err, c)
+		return handler.HandleHTTPError(err)
 	}
 
 	return c.JSON(http.StatusOK, models.Message{Message: "The password was updated successfully."})
diff --git a/pkg/routes/caldav/handler.go b/pkg/routes/caldav/handler.go
index 05dd69332..c8ec4fb03 100644
--- a/pkg/routes/caldav/handler.go
+++ b/pkg/routes/caldav/handler.go
@@ -176,7 +176,7 @@ func getIntParam(c echo.Context, paramName string) (intParam int64, err error) {
 
 	intParam, err = strconv.ParseInt(param, 10, 64)
 	if err != nil {
-		return 0, handler.HandleHTTPError(err, c)
+		return 0, handler.HandleHTTPError(err)
 	}
 	return
 }
diff --git a/pkg/web/handler/create.go b/pkg/web/handler/create.go
index 5af1cac08..f2e6fb3e1 100644
--- a/pkg/web/handler/create.go
+++ b/pkg/web/handler/create.go
@@ -61,7 +61,7 @@ func (c *WebHandler) CreateWeb(ctx echo.Context) error {
 	canCreate, err := currentStruct.CanCreate(s, currentAuth)
 	if err != nil {
 		_ = s.Rollback()
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 	if !canCreate {
 		_ = s.Rollback()
@@ -73,17 +73,17 @@ func (c *WebHandler) CreateWeb(ctx echo.Context) error {
 	err = currentStruct.Create(s, currentAuth)
 	if err != nil {
 		_ = s.Rollback()
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	err = s.Commit()
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	err = ctx.JSON(http.StatusCreated, currentStruct)
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 	return err
 }
diff --git a/pkg/web/handler/delete.go b/pkg/web/handler/delete.go
index d76bea2dc..e617d9262 100644
--- a/pkg/web/handler/delete.go
+++ b/pkg/web/handler/delete.go
@@ -60,7 +60,7 @@ func (c *WebHandler) DeleteWeb(ctx echo.Context) error {
 	canDelete, err := currentStruct.CanDelete(s, currentAuth)
 	if err != nil {
 		_ = s.Rollback()
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 	if !canDelete {
 		_ = s.Rollback()
@@ -71,17 +71,17 @@ func (c *WebHandler) DeleteWeb(ctx echo.Context) error {
 	err = currentStruct.Delete(s, currentAuth)
 	if err != nil {
 		_ = s.Rollback()
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	err = s.Commit()
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	err = ctx.JSON(http.StatusOK, message{"Successfully deleted."})
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 	return err
 }
diff --git a/pkg/web/handler/helper.go b/pkg/web/handler/helper.go
index 0d009e3a4..22328f67c 100644
--- a/pkg/web/handler/helper.go
+++ b/pkg/web/handler/helper.go
@@ -36,7 +36,7 @@ type CObject interface {
 }
 
 // HandleHTTPError does what it says
-func HandleHTTPError(err error, ctx echo.Context) *echo.HTTPError {
+func HandleHTTPError(err error) *echo.HTTPError {
 	config.LoggingProvider.Error(err.Error())
 	if a, has := err.(web.HTTPErrorProcessor); has {
 		errDetails := a.HTTPError()
diff --git a/pkg/web/handler/read_all.go b/pkg/web/handler/read_all.go
index c09ce3c63..585077e9c 100644
--- a/pkg/web/handler/read_all.go
+++ b/pkg/web/handler/read_all.go
@@ -96,7 +96,7 @@ func (c *WebHandler) ReadAllWeb(ctx echo.Context) error {
 	result, resultCount, numberOfItems, err := currentStruct.ReadAll(s, currentAuth, search, pageNumber, perPageNumber)
 	if err != nil {
 		_ = s.Rollback()
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	// Calculate the number of pages from the number of items
@@ -118,12 +118,12 @@ func (c *WebHandler) ReadAllWeb(ctx echo.Context) error {
 
 	err = s.Commit()
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	err = ctx.JSON(http.StatusOK, result)
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 	return err
 }
diff --git a/pkg/web/handler/read_one.go b/pkg/web/handler/read_one.go
index 4826d37ff..cc38bb067 100644
--- a/pkg/web/handler/read_one.go
+++ b/pkg/web/handler/read_one.go
@@ -56,7 +56,7 @@ func (c *WebHandler) ReadOneWeb(ctx echo.Context) error {
 	canRead, maxRight, err := currentStruct.CanRead(s, currentAuth)
 	if err != nil {
 		_ = s.Rollback()
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 	if !canRead {
 		_ = s.Rollback()
@@ -68,7 +68,7 @@ func (c *WebHandler) ReadOneWeb(ctx echo.Context) error {
 	err = currentStruct.ReadOne(s, currentAuth)
 	if err != nil {
 		_ = s.Rollback()
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	// Set the headers
@@ -79,12 +79,12 @@ func (c *WebHandler) ReadOneWeb(ctx echo.Context) error {
 
 	err = s.Commit()
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	err = ctx.JSON(http.StatusOK, currentStruct)
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 	return err
 }
diff --git a/pkg/web/handler/update.go b/pkg/web/handler/update.go
index fa9ef835a..c36bd3754 100644
--- a/pkg/web/handler/update.go
+++ b/pkg/web/handler/update.go
@@ -61,7 +61,7 @@ func (c *WebHandler) UpdateWeb(ctx echo.Context) error {
 	canUpdate, err := currentStruct.CanUpdate(s, currentAuth)
 	if err != nil {
 		_ = s.Rollback()
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 	if !canUpdate {
 		_ = s.Rollback()
@@ -73,17 +73,17 @@ func (c *WebHandler) UpdateWeb(ctx echo.Context) error {
 	err = currentStruct.Update(s, currentAuth)
 	if err != nil {
 		_ = s.Rollback()
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	err = s.Commit()
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 
 	err = ctx.JSON(http.StatusOK, currentStruct)
 	if err != nil {
-		return HandleHTTPError(err, ctx)
+		return HandleHTTPError(err)
 	}
 	return err
 }