diff --git a/src/Twilio/Http/BearerToken/ApiTokenManager.cs b/src/Twilio/Http/BearerToken/ApiTokenManager.cs
index 2d36e4a99..e6ee063bc 100644
--- a/src/Twilio/Http/BearerToken/ApiTokenManager.cs
+++ b/src/Twilio/Http/BearerToken/ApiTokenManager.cs
@@ -1,4 +1,4 @@
-using Twilio.Rest.Iam.V1;
+using Twilio.Rest.Oauth.V2;
 using Twilio.Exceptions;
 using System;
 using Twilio.Annotations;
@@ -43,7 +43,9 @@ public ApiTokenManager(
         }
 
         public string fetchAccessToken(){
-           CreateTokenOptions createTokenOptions = new CreateTokenOptions(GrantType, ClientId);
+           CreateTokenOptions createTokenOptions = new CreateTokenOptions();
+           if(GrantType != null){ createTokenOptions.GrantType = GrantType;}
+           if(ClientId != null){ createTokenOptions.ClientId = ClientId;}
            if(ClientSecret != null){ createTokenOptions.ClientSecret = ClientSecret;}
            if(Code != null){ createTokenOptions.Code = Code; }
            if(RedirectUri != null){ createTokenOptions.RedirectUri = RedirectUri; }
diff --git a/src/Twilio/Http/BearerToken/OrgsTokenManager.cs b/src/Twilio/Http/BearerToken/OrgsTokenManager.cs
index 716ac7bbc..399d426db 100644
--- a/src/Twilio/Http/BearerToken/OrgsTokenManager.cs
+++ b/src/Twilio/Http/BearerToken/OrgsTokenManager.cs
@@ -1,4 +1,4 @@
-using Twilio.Rest.Iam.V1;
+using Twilio.Rest.Oauth.V2;
 using Twilio.Exceptions;
 using System;
 using Twilio.Annotations;
@@ -42,7 +42,9 @@ public OrgsTokenManager(
         }
 
         public string fetchAccessToken(){
-           CreateTokenOptions createTokenOptions = new CreateTokenOptions(GrantType, ClientId);
+           CreateTokenOptions createTokenOptions = new CreateTokenOptions();
+           if(GrantType != null){ createTokenOptions.GrantType = GrantType;}
+           if(ClientId != null){ createTokenOptions.ClientId = ClientId;}
            if(ClientSecret != null){ createTokenOptions.ClientSecret = ClientSecret;}
            if(Code != null){ createTokenOptions.Code = Code; }
            if(RedirectUri != null){ createTokenOptions.RedirectUri = RedirectUri; }