diff --git a/CHANGES b/CHANGES
index 2de76edd8..6560e5a10 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2887,3 +2887,6 @@
 * archive: disable archiving for pre-8.2 backups. we don't have enough info to unarchive
 * dashboard: fix browser caching issue
 
+[8.2.2]
+* gandi: add token type in the setup view
+
diff --git a/dashboard/public/js/setup.js b/dashboard/public/js/setup.js
index 83fe575d5..389f3c130 100644
--- a/dashboard/public/js/setup.js
+++ b/dashboard/public/js/setup.js
@@ -87,6 +87,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
         gcdnsKey: { keyFileName: '', content: '' },
         digitalOceanToken: '',
         gandiApiKey: '',
+        gandiTokenType: 'PAT',
         cloudflareEmail: '',
         cloudflareToken: '',
         cloudflareTokenType: 'GlobalApiKey',
@@ -181,6 +182,7 @@ app.controller('SetupDNSController', ['$scope', '$http', '$timeout', 'Client', f
             config.token = $scope.dnsCredentials.digitalOceanToken;
         } else if (provider === 'gandi') {
             config.token = $scope.dnsCredentials.gandiApiKey;
+            config.tokenType = $scope.dnsCredentials.gandiTokenType;
         } else if (provider === 'godaddy') {
             config.apiKey = $scope.dnsCredentials.godaddyApiKey;
             config.apiSecret = $scope.dnsCredentials.godaddyApiSecret;
diff --git a/dashboard/setup.html b/dashboard/setup.html
index fb7ed1439..d95dc1718 100644
--- a/dashboard/setup.html
+++ b/dashboard/setup.html
@@ -146,6 +146,13 @@
                 </div>
 
                 <!-- Gandi -->
+                <div class="form-group" ng-class="{ 'has-error': false }" ng-show="dnsCredentials.provider === 'gandi'">
+                  <label class="control-label">Token Type</label>
+                  <select class="form-control" ng-model="dnsCredentials.gandiTokenType">
+                    <option value="ApiKey">API Key (Deprecated)</option>
+                    <option value="PAT">Personal Access Token (PAT)</option>
+                  </select>
+                </div>
                 <div class="form-group" ng-class="{ 'has-error': dnsCredentialsForm.gandiApiKey.$dirty && dnsCredentialsForm.gandiApiKey.$invalid }" ng-show="dnsCredentials.provider === 'gandi'">
                   <label class="control-label">Gandi API Key</label>
                   <input type="text" class="form-control" ng-model="dnsCredentials.gandiApiKey" name="gandiApiKey" placeholder="API Key" ng-required="dnsCredentials.provider === 'gandi'" ng-disabled="dnsCredentials.busy">