diff --git a/internal/api/controller/serviceaccount/create_token.go b/internal/api/controller/serviceaccount/create_token.go
index 4477397c3..dfa3ebd4c 100644
--- a/internal/api/controller/serviceaccount/create_token.go
+++ b/internal/api/controller/serviceaccount/create_token.go
@@ -36,7 +36,8 @@ func (c *Controller) CreateToken(ctx context.Context, session *auth.Session,
 	if err = check.TokenLifetime(in.Lifetime); err != nil {
 		return nil, err
 	}
-	if err = check.AccessGrant(in.Grants, false); err != nil {
+	// TODO: Added to unblock UI - Depending on product decision enforce grants, or remove Grants completely.
+	if err = check.AccessGrant(in.Grants, true); err != nil {
 		return nil, err
 	}
 
diff --git a/internal/api/controller/user/create_access_token.go b/internal/api/controller/user/create_access_token.go
index 89d9bacd2..2d69762b3 100644
--- a/internal/api/controller/user/create_access_token.go
+++ b/internal/api/controller/user/create_access_token.go
@@ -43,7 +43,8 @@ func (c *Controller) CreateAccessToken(ctx context.Context, session *auth.Sessio
 	if err = check.TokenLifetime(in.Lifetime); err != nil {
 		return nil, err
 	}
-	if err = check.AccessGrant(in.Grants, false); err != nil {
+	// TODO: Added to unblock UI - Depending on product decision enforce grants, or remove Grants completely.
+	if err = check.AccessGrant(in.Grants, true); err != nil {
 		return nil, err
 	}
 
diff --git a/internal/token/token.go b/internal/token/token.go
index c70a3420d..401f41a55 100644
--- a/internal/token/token.go
+++ b/internal/token/token.go
@@ -15,8 +15,7 @@ import (
 )
 
 const (
-	userTokenLifeTime time.Duration = 24 * time.Hour   // 1 day.
-	oathTokenLifeTime time.Duration = 30 * time.Minute // 30 min.
+	userTokenLifeTime time.Duration = 24 * time.Hour // 1 day.
 )
 
 func CreateUserSession(ctx context.Context, tokenStore store.TokenStore,
@@ -64,21 +63,6 @@ func CreateSAT(ctx context.Context, tokenStore store.TokenStore,
 	)
 }
 
-func CreateOAuth(ctx context.Context, tokenStore store.TokenStore,
-	createdBy *types.Principal, createdFor *types.User,
-	name string, grants enum.AccessGrant) (*types.Token, string, error) {
-	return Create(
-		ctx,
-		tokenStore,
-		enum.TokenTypeOAuth2,
-		createdBy,
-		createdFor.ToPrincipal(),
-		name,
-		oathTokenLifeTime,
-		grants,
-	)
-}
-
 func Create(ctx context.Context, tokenStore store.TokenStore,
 	tokenType enum.TokenType, createdBy *types.Principal, createdFor *types.Principal,
 	uid string, lifetime time.Duration, grants enum.AccessGrant) (*types.Token, string, error) {
diff --git a/types/enum/token.go b/types/enum/token.go
index ebfa1b177..518d24497 100644
--- a/types/enum/token.go
+++ b/types/enum/token.go
@@ -16,7 +16,4 @@ const (
 
 	// TokenTypeSAT is a service account access token.
 	TokenTypeSAT TokenType = "sat"
-
-	// TokenTypeOAuth2 is the token returned to an oauth client.
-	TokenTypeOAuth2 TokenType = "oauth2"
 )