diff --git a/pkg/cmd/user.go b/pkg/cmd/user.go
index 56512f684..5a46703b0 100644
--- a/pkg/cmd/user.go
+++ b/pkg/cmd/user.go
@@ -18,12 +18,13 @@
 package cmd
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"fmt"
 	"os"
 	"strconv"
 	"strings"
 	"time"
+
+	"code.vikunja.io/api/pkg/db"
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/initialize"
diff --git a/pkg/db/db.go b/pkg/db/db.go
index b68f76bb5..e7028bd94 100644
--- a/pkg/db/db.go
+++ b/pkg/db/db.go
@@ -24,6 +24,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
 	"xorm.io/xorm/schemas"
 
 	"code.vikunja.io/api/pkg/config"
diff --git a/pkg/files/files.go b/pkg/files/files.go
index 86cdec50d..2badae879 100644
--- a/pkg/files/files.go
+++ b/pkg/files/files.go
@@ -17,11 +17,12 @@
 package files
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"io"
 	"strconv"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/web"
 	"github.com/c2h5oh/datasize"
diff --git a/pkg/models/label.go b/pkg/models/label.go
index f3bebcf03..28b1a33a3 100644
--- a/pkg/models/label.go
+++ b/pkg/models/label.go
@@ -18,6 +18,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/models/label_task.go b/pkg/models/label_task.go
index cc7e99797..2ca38b6f8 100644
--- a/pkg/models/label_task.go
+++ b/pkg/models/label_task.go
@@ -20,6 +20,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/log"
diff --git a/pkg/models/link_sharing.go b/pkg/models/link_sharing.go
index 67c0cc2a2..86aa9c61a 100644
--- a/pkg/models/link_sharing.go
+++ b/pkg/models/link_sharing.go
@@ -19,6 +19,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/models/list_team.go b/pkg/models/list_team.go
index 4fc2c395f..6afa3839b 100644
--- a/pkg/models/list_team.go
+++ b/pkg/models/list_team.go
@@ -18,6 +18,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/web"
diff --git a/pkg/models/list_users.go b/pkg/models/list_users.go
index 99b0a31ec..bf6bf61c2 100644
--- a/pkg/models/list_users.go
+++ b/pkg/models/list_users.go
@@ -18,6 +18,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/models/list_users_test.go b/pkg/models/list_users_test.go
index 48c9828cf..4b0129b16 100644
--- a/pkg/models/list_users_test.go
+++ b/pkg/models/list_users_test.go
@@ -17,12 +17,13 @@
 package models
 
 import (
-	"github.com/stretchr/testify/assert"
 	"reflect"
 	"runtime"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"gopkg.in/d4l3k/messagediff.v1"
diff --git a/pkg/models/namespace.go b/pkg/models/namespace.go
index 0619ea600..783dd69b6 100644
--- a/pkg/models/namespace.go
+++ b/pkg/models/namespace.go
@@ -21,6 +21,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/log"
diff --git a/pkg/models/namespace_team.go b/pkg/models/namespace_team.go
index c6cbaad9f..2023d69c9 100644
--- a/pkg/models/namespace_team.go
+++ b/pkg/models/namespace_team.go
@@ -18,6 +18,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/web"
diff --git a/pkg/models/namespace_users.go b/pkg/models/namespace_users.go
index 4b6f314cb..583399398 100644
--- a/pkg/models/namespace_users.go
+++ b/pkg/models/namespace_users.go
@@ -18,6 +18,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	user2 "code.vikunja.io/api/pkg/user"
diff --git a/pkg/models/namespace_users_test.go b/pkg/models/namespace_users_test.go
index a7382f5b3..5c0029795 100644
--- a/pkg/models/namespace_users_test.go
+++ b/pkg/models/namespace_users_test.go
@@ -17,12 +17,13 @@
 package models
 
 import (
-	"github.com/stretchr/testify/assert"
 	"reflect"
 	"runtime"
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web"
diff --git a/pkg/models/saved_filters.go b/pkg/models/saved_filters.go
index fc2882a80..f77e48e9b 100644
--- a/pkg/models/saved_filters.go
+++ b/pkg/models/saved_filters.go
@@ -18,6 +18,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/models/task_attachment.go b/pkg/models/task_attachment.go
index ef79faad3..fdbeb2d45 100644
--- a/pkg/models/task_attachment.go
+++ b/pkg/models/task_attachment.go
@@ -19,6 +19,7 @@ package models
 import (
 	"io"
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/files"
diff --git a/pkg/models/task_comments.go b/pkg/models/task_comments.go
index 1c813e924..adf619c26 100644
--- a/pkg/models/task_comments.go
+++ b/pkg/models/task_comments.go
@@ -19,6 +19,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/models/task_relation.go b/pkg/models/task_relation.go
index 4a49e26e6..0b4d826c7 100644
--- a/pkg/models/task_relation.go
+++ b/pkg/models/task_relation.go
@@ -19,6 +19,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/models/task_reminder.go b/pkg/models/task_reminder.go
index e0b9b3ca2..15a9d6c91 100644
--- a/pkg/models/task_reminder.go
+++ b/pkg/models/task_reminder.go
@@ -17,8 +17,9 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"time"
+
+	"code.vikunja.io/api/pkg/db"
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/config"
diff --git a/pkg/models/tasks.go b/pkg/models/tasks.go
index 1d97b441d..fb49dc6db 100644
--- a/pkg/models/tasks.go
+++ b/pkg/models/tasks.go
@@ -17,12 +17,13 @@
 package models
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"math"
 	"sort"
 	"strconv"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/metrics"
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/models/teams.go b/pkg/models/teams.go
index f7f841055..27611a4d7 100644
--- a/pkg/models/teams.go
+++ b/pkg/models/teams.go
@@ -18,6 +18,7 @@ package models
 
 import (
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/metrics"
diff --git a/pkg/modules/auth/openid/openid.go b/pkg/modules/auth/openid/openid.go
index 842214a1c..ae4070060 100644
--- a/pkg/modules/auth/openid/openid.go
+++ b/pkg/modules/auth/openid/openid.go
@@ -17,12 +17,13 @@
 package openid
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"context"
 	"encoding/json"
 	"math/rand"
 	"net/http"
 	"time"
+
+	"code.vikunja.io/api/pkg/db"
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/log"
diff --git a/pkg/modules/background/handler/background.go b/pkg/modules/background/handler/background.go
index ad875291a..b84391079 100644
--- a/pkg/modules/background/handler/background.go
+++ b/pkg/modules/background/handler/background.go
@@ -17,11 +17,12 @@
 package handler
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"io"
 	"net/http"
 	"strconv"
 	"strings"
+
+	"code.vikunja.io/api/pkg/db"
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/files"
diff --git a/pkg/modules/background/unsplash/unsplash.go b/pkg/modules/background/unsplash/unsplash.go
index 2247a8fca..963dcb9ca 100644
--- a/pkg/modules/background/unsplash/unsplash.go
+++ b/pkg/modules/background/unsplash/unsplash.go
@@ -25,6 +25,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/config"
diff --git a/pkg/modules/background/upload/upload.go b/pkg/modules/background/upload/upload.go
index cc6170a1e..3e5d280ce 100644
--- a/pkg/modules/background/upload/upload.go
+++ b/pkg/modules/background/upload/upload.go
@@ -18,6 +18,7 @@ package upload
 
 import (
 	"strconv"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/files"
diff --git a/pkg/modules/migration/create_from_structure.go b/pkg/modules/migration/create_from_structure.go
index 42e892099..28211925b 100644
--- a/pkg/modules/migration/create_from_structure.go
+++ b/pkg/modules/migration/create_from_structure.go
@@ -18,9 +18,10 @@ package migration
 
 import (
 	"bytes"
-	"code.vikunja.io/api/pkg/db"
 	"io/ioutil"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/files"
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
diff --git a/pkg/modules/migration/migration_status.go b/pkg/modules/migration/migration_status.go
index cc880fd52..08d082ebb 100644
--- a/pkg/modules/migration/migration_status.go
+++ b/pkg/modules/migration/migration_status.go
@@ -17,9 +17,10 @@
 package migration
 
 import (
+	"time"
+
 	"code.vikunja.io/api/pkg/db"
 	"code.vikunja.io/api/pkg/user"
-	"time"
 )
 
 // Status represents this migration status
diff --git a/pkg/routes/api/v1/link_sharing_auth.go b/pkg/routes/api/v1/link_sharing_auth.go
index d5e5288f4..a457fe25c 100644
--- a/pkg/routes/api/v1/link_sharing_auth.go
+++ b/pkg/routes/api/v1/link_sharing_auth.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/auth"
 	"code.vikunja.io/web/handler"
diff --git a/pkg/routes/api/v1/list_by_namespace.go b/pkg/routes/api/v1/list_by_namespace.go
index caaa7cc73..2b668da01 100644
--- a/pkg/routes/api/v1/list_by_namespace.go
+++ b/pkg/routes/api/v1/list_by_namespace.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 	"strconv"
+
+	"code.vikunja.io/api/pkg/db"
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/models"
diff --git a/pkg/routes/api/v1/login.go b/pkg/routes/api/v1/login.go
index 6141865ad..b7ac1cfef 100644
--- a/pkg/routes/api/v1/login.go
+++ b/pkg/routes/api/v1/login.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/modules/auth"
 	user2 "code.vikunja.io/api/pkg/user"
diff --git a/pkg/routes/api/v1/task_attachment.go b/pkg/routes/api/v1/task_attachment.go
index db1767412..bd4e99ede 100644
--- a/pkg/routes/api/v1/task_attachment.go
+++ b/pkg/routes/api/v1/task_attachment.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/models"
 	auth2 "code.vikunja.io/api/pkg/modules/auth"
 	"code.vikunja.io/web/handler"
diff --git a/pkg/routes/api/v1/user_confirm_email.go b/pkg/routes/api/v1/user_confirm_email.go
index 4cfc9d833..c99bb1c91 100644
--- a/pkg/routes/api/v1/user_confirm_email.go
+++ b/pkg/routes/api/v1/user_confirm_email.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web/handler"
diff --git a/pkg/routes/api/v1/user_list.go b/pkg/routes/api/v1/user_list.go
index 5fdd15d2d..2893125bd 100644
--- a/pkg/routes/api/v1/user_list.go
+++ b/pkg/routes/api/v1/user_list.go
@@ -17,10 +17,11 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 	"strconv"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/models"
 	auth2 "code.vikunja.io/api/pkg/modules/auth"
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/routes/api/v1/user_password_reset.go b/pkg/routes/api/v1/user_password_reset.go
index 49fc6c2c7..d24262b2a 100644
--- a/pkg/routes/api/v1/user_password_reset.go
+++ b/pkg/routes/api/v1/user_password_reset.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web/handler"
diff --git a/pkg/routes/api/v1/user_register.go b/pkg/routes/api/v1/user_register.go
index a5d1dcad0..1030149e8 100644
--- a/pkg/routes/api/v1/user_register.go
+++ b/pkg/routes/api/v1/user_register.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/routes/api/v1/user_settings.go b/pkg/routes/api/v1/user_settings.go
index 9644b2ae8..59c44610a 100644
--- a/pkg/routes/api/v1/user_settings.go
+++ b/pkg/routes/api/v1/user_settings.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/models"
 	user2 "code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web/handler"
diff --git a/pkg/routes/api/v1/user_show.go b/pkg/routes/api/v1/user_show.go
index 7939ed018..d5953e1ed 100644
--- a/pkg/routes/api/v1/user_show.go
+++ b/pkg/routes/api/v1/user_show.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	user2 "code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web/handler"
 	"github.com/labstack/echo/v4"
diff --git a/pkg/routes/api/v1/user_totp.go b/pkg/routes/api/v1/user_totp.go
index 4b464333c..097a5fc1a 100644
--- a/pkg/routes/api/v1/user_totp.go
+++ b/pkg/routes/api/v1/user_totp.go
@@ -18,11 +18,12 @@ package v1
 
 import (
 	"bytes"
-	"code.vikunja.io/api/pkg/db"
 	"fmt"
 	"image/jpeg"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/routes/api/v1/user_update_email.go b/pkg/routes/api/v1/user_update_email.go
index a5ccf2596..cba4a1c0a 100644
--- a/pkg/routes/api/v1/user_update_email.go
+++ b/pkg/routes/api/v1/user_update_email.go
@@ -17,10 +17,11 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"fmt"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
diff --git a/pkg/routes/api/v1/user_update_password.go b/pkg/routes/api/v1/user_update_password.go
index e3667a877..fa87a57db 100644
--- a/pkg/routes/api/v1/user_update_password.go
+++ b/pkg/routes/api/v1/user_update_password.go
@@ -17,9 +17,10 @@
 package v1
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"net/http"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/models"
 	"code.vikunja.io/api/pkg/user"
 	"code.vikunja.io/web/handler"
diff --git a/pkg/routes/caldav/listStorageProvider.go b/pkg/routes/caldav/listStorageProvider.go
index e36e86a8b..9e36bfcae 100644
--- a/pkg/routes/caldav/listStorageProvider.go
+++ b/pkg/routes/caldav/listStorageProvider.go
@@ -17,11 +17,12 @@
 package caldav
 
 import (
-	"code.vikunja.io/api/pkg/db"
 	"strconv"
 	"strings"
 	"time"
 
+	"code.vikunja.io/api/pkg/db"
+
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/models"
 	user2 "code.vikunja.io/api/pkg/user"
diff --git a/pkg/user/totp.go b/pkg/user/totp.go
index 959466df1..b1f836a60 100644
--- a/pkg/user/totp.go
+++ b/pkg/user/totp.go
@@ -18,6 +18,7 @@ package user
 
 import (
 	"image"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/config"
diff --git a/pkg/user/user.go b/pkg/user/user.go
index 0be2782ef..f658b3165 100644
--- a/pkg/user/user.go
+++ b/pkg/user/user.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"reflect"
 	"time"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/web"
diff --git a/pkg/user/users_list.go b/pkg/user/users_list.go
index 4edbd1ecd..0f7e12b59 100644
--- a/pkg/user/users_list.go
+++ b/pkg/user/users_list.go
@@ -20,6 +20,7 @@ package user
 import (
 	"strconv"
 	"strings"
+
 	"xorm.io/xorm"
 
 	"code.vikunja.io/api/pkg/log"