diff --git a/clientapi/auth/challenge_response.go b/clientapi/auth/challenge_response.go
index e1fdbd253..c15ab4572 100644
--- a/clientapi/auth/challenge_response.go
+++ b/clientapi/auth/challenge_response.go
@@ -2,13 +2,14 @@ package auth
 
 import (
 	"context"
+	"net/http"
+
 	"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/clientapi/userutil"
 	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/util"
-	"net/http"
 )
 
 type GetAccountByChallengeResponse func(ctx context.Context, localpart, b64encodedSignature, challenge string) (*api.Account, error)
diff --git a/clientapi/auth/user_interactive.go b/clientapi/auth/user_interactive.go
index e6786e092..f7b9b95be 100644
--- a/clientapi/auth/user_interactive.go
+++ b/clientapi/auth/user_interactive.go
@@ -18,14 +18,15 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
+	"time"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/util"
 	"github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
-	"net/http"
-	"time"
 )
 
 // Type represents an auth type
diff --git a/clientapi/auth/user_interactive_test.go b/clientapi/auth/user_interactive_test.go
index fc9ead9fc..0315d9e35 100644
--- a/clientapi/auth/user_interactive_test.go
+++ b/clientapi/auth/user_interactive_test.go
@@ -7,9 +7,10 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/tidwall/gjson"
 	"testing"
 
+	"github.com/tidwall/gjson"
+
 	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/gomatrixserverlib"
diff --git a/clientapi/httputil/httputil.go b/clientapi/httputil/httputil.go
index a4f791c24..cae42611c 100644
--- a/clientapi/httputil/httputil.go
+++ b/clientapi/httputil/httputil.go
@@ -17,11 +17,12 @@ package httputil
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/matrix-org/dendrite/clientapi/auth"
 	"io/ioutil"
 	"net/http"
 	"unicode/utf8"
 
+	"github.com/matrix-org/dendrite/clientapi/auth"
+
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
 	"github.com/matrix-org/util"
 )
diff --git a/clientapi/routing/login.go b/clientapi/routing/login.go
index d64c4f317..5cec07d55 100644
--- a/clientapi/routing/login.go
+++ b/clientapi/routing/login.go
@@ -17,10 +17,11 @@ package routing
 import (
 	"context"
 	"fmt"
-	"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
 	"io/ioutil"
 	"net/http"
 
+	"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
+
 	"github.com/matrix-org/dendrite/clientapi/auth"
 	"github.com/matrix-org/dendrite/clientapi/httputil"
 	"github.com/matrix-org/dendrite/clientapi/jsonerror"
diff --git a/cmd/sign-challenge/main.go b/cmd/sign-challenge/main.go
index 6dbc50da7..16505fcc0 100644
--- a/cmd/sign-challenge/main.go
+++ b/cmd/sign-challenge/main.go
@@ -19,8 +19,9 @@ import (
 	"encoding/base64"
 	"flag"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"os"
+
+	"github.com/sirupsen/logrus"
 )
 
 const usage = `Usage: %s