diff --git a/lib/src/oauth2_flows/implicit.dart b/lib/src/oauth2_flows/implicit.dart
index 66d5113..a90dae6 100644
--- a/lib/src/oauth2_flows/implicit.dart
+++ b/lib/src/oauth2_flows/implicit.dart
@@ -141,7 +141,9 @@ class ImplicitFlow {
           ? responseTypes
               .map((responseType) => _responseTypeToString(responseType))
               .join(' ')
-          : hybrid ? 'code token' : 'token',
+          : hybrid
+              ? 'code token'
+              : 'token',
       'scope': _scopes.join(' '),
       'access_type': hybrid ? 'offline' : 'online',
     };
diff --git a/lib/src/oauth2_flows/jwt.dart b/lib/src/oauth2_flows/jwt.dart
index 0aaaf54..aa1931b 100644
--- a/lib/src/oauth2_flows/jwt.dart
+++ b/lib/src/oauth2_flows/jwt.dart
@@ -75,11 +75,20 @@ class JwtFlow {
         .transform(json.decoder)
         .first;
     Map response = object as Map;
-    var tokenType = response['token_type'];
-    var token = response['access_token'];
-    var expiresIn = response['expires_in'];
+    String tokenType = response['token_type'];
+    String token = response['access_token'];
+    int expiresIn = response['expires_in'];
     var error = response['error'];
 
+    if (response['id_token'] != null) {
+      tokenType = 'Bearer';
+      token = response['id_token'];
+      final payloadB64 = token.split('.')[1];
+      final decoded =
+          jsonDecode(ascii.decode(base64Decode(base64.normalize(payloadB64))));
+      expiresIn = decoded['exp'] * 1000;
+    }
+
     if (httpResponse.statusCode != 200 && error != null) {
       throw new Exception('Unable to obtain credentials. Error: $error.');
     }