diff --git a/authenticator.go b/authenticator.go
index d424027..4a7b8fa 100644
--- a/authenticator.go
+++ b/authenticator.go
@@ -16,9 +16,9 @@ const (
 )
 
 var (
-	ErrNoAuthHeader      = errors.New("Authorization header is missing")
-	ErrInvalidAuthHeader = errors.New("Authorization header is malformed")
-	ErrClaimsInvalid     = errors.New("Provided claims do not match expected scopes")
+	ErrNoAuthHeader      = errors.New("authorization header is missing")
+	ErrInvalidAuthHeader = errors.New("authorization header is malformed")
+	ErrClaimsInvalid     = errors.New("provided claims do not match expected scopes")
 )
 
 // JWSValidator ...
diff --git a/tbac.go b/tbac.go
index c6843d2..3fe34d0 100644
--- a/tbac.go
+++ b/tbac.go
@@ -78,10 +78,10 @@ func (t *Team) Validate() error {
 
 // User is a user.
 type User struct {
-	*adapters.User
-
 	Teams *[]Team `gorm:"many2many:user_teams;"`
 	Roles *[]Role `gorm:"many2many:user_roles;"`
+
+	adapters.User
 }
 
 // UserRole is a user role.