diff --git a/pkg/user/activation.go b/pkg/user/activation.go
index 4ea7604b3..128651312 100644
--- a/pkg/user/activation.go
+++ b/pkg/user/activation.go
@@ -138,16 +138,15 @@ func ActivateNewUser(fac models.Repo, name string, id uuid.UUID, password string
 	if err != nil {
 		return nil, err
 	}
+	if t == nil || t.Type != models.UserTokenTypeNewUser {
+		return nil, ErrInvalidActivationKey
+	}
 
 	data, err := t.GetNewUserTokenData()
 	if err != nil {
 		return nil, err
 	}
 
-	if t == nil || t.Type != models.UserTokenTypeNewUser {
-		return nil, ErrInvalidActivationKey
-	}
-
 	var invitedBy *uuid.UUID
 	if config.GetRequireInvite() {
 		if data.InviteKey == nil {