diff --git a/cmd/api/src/api/v2/auth/login.go b/cmd/api/src/api/v2/auth/login.go
index 201644fa96..4e00588bdd 100644
--- a/cmd/api/src/api/v2/auth/login.go
+++ b/cmd/api/src/api/v2/auth/login.go
@@ -69,18 +69,21 @@ func (s LoginResource) loginSecret(loginRequest api.LoginRequest, response http.
 
 func (s LoginResource) Login(response http.ResponseWriter, request *http.Request) {
 	var loginRequest api.LoginRequest
-
 	if err := api.ReadJSONRequestPayloadLimited(&loginRequest, request); err != nil {
 		api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusBadRequest, err.Error(), request), response)
-	} else if err = s.patchEULAAcceptance(request.Context(), loginRequest.Username); err != nil {
-		api.HandleDatabaseError(request, response, err)
 	} else {
-		switch strings.ToLower(loginRequest.LoginMethod) {
-		case auth.ProviderTypeSecret:
-			s.loginSecret(loginRequest, response, request)
+		// Trim leading and trailing spaces from the username
+		loginRequest.Username = strings.TrimSpace(loginRequest.Username)
 
-		default:
-			api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusBadRequest, fmt.Sprintf("Login method %s is not supported.", loginRequest.LoginMethod), request), response)
+		if err = s.patchEULAAcceptance(request.Context(), loginRequest.Username); err != nil {
+			api.HandleDatabaseError(request, response, err)
+		} else {
+			switch strings.ToLower(loginRequest.LoginMethod) {
+			case auth.ProviderTypeSecret:
+				s.loginSecret(loginRequest, response, request)
+			default:
+				api.WriteErrorResponse(request.Context(), api.BuildErrorResponse(http.StatusBadRequest, fmt.Sprintf("Login method %s is not supported.", loginRequest.LoginMethod), request), response)
+			}
 		}
 	}
 }
diff --git a/packages/go/graphschema/ad/ad.go b/packages/go/graphschema/ad/ad.go
index 5e0930561f..59d7b5e670 100644
--- a/packages/go/graphschema/ad/ad.go
+++ b/packages/go/graphschema/ad/ad.go
@@ -21,6 +21,7 @@ package ad
 
 import (
 	"errors"
+
 	graph "github.com/specterops/bloodhound/dawgs/graph"
 )
 
diff --git a/packages/go/graphschema/azure/azure.go b/packages/go/graphschema/azure/azure.go
index c0e8651a4b..f896acfcf8 100644
--- a/packages/go/graphschema/azure/azure.go
+++ b/packages/go/graphschema/azure/azure.go
@@ -21,6 +21,7 @@ package azure
 
 import (
 	"errors"
+
 	graph "github.com/specterops/bloodhound/dawgs/graph"
 )
 
diff --git a/packages/go/graphschema/common/common.go b/packages/go/graphschema/common/common.go
index f5c2241da4..9fedbf6627 100644
--- a/packages/go/graphschema/common/common.go
+++ b/packages/go/graphschema/common/common.go
@@ -21,6 +21,7 @@ package common
 
 import (
 	"errors"
+
 	graph "github.com/specterops/bloodhound/dawgs/graph"
 	ad "github.com/specterops/bloodhound/graphschema/ad"
 	azure "github.com/specterops/bloodhound/graphschema/azure"