diff --git a/app/portainer/components/forms/registry-form-dockerhub/registry-form-dockerhub.html b/app/portainer/components/forms/registry-form-dockerhub/registry-form-dockerhub.html
index 269162a1d..8671c8152 100644
--- a/app/portainer/components/forms/registry-form-dockerhub/registry-form-dockerhub.html
+++ b/app/portainer/components/forms/registry-form-dockerhub/registry-form-dockerhub.html
@@ -1,4 +1,13 @@
 <form class="form-horizontal" name="registryFormDockerhub" ng-submit="$ctrl.formAction()">
+  <div class="col-sm-12 form-section-title"> Important notice </div>
+  <div class="form-group">
+    <span class="col-sm-12 text-muted small">
+      <p>
+        For information on how to generate a DockerHub Access Token, follow the
+        <a href="https://docs.docker.com/docker-hub/access-tokens/" target="_blank">dockerhub guide</a>.
+      </p>
+    </span>
+  </div>
   <div class="col-sm-12 form-section-title"> DockerHub account details </div>
   <!-- name-input -->
   <div class="form-group">
@@ -32,7 +41,7 @@
   <!-- !credentials-user -->
   <!-- credentials-password -->
   <div class="form-group">
-    <label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left">DockerHub password</label>
+    <label for="registry_password" class="col-sm-3 col-lg-2 control-label text-left">DockerHub access token</label>
     <div class="col-sm-9 col-lg-10">
       <input type="password" class="form-control" id="registry_password" name="registry_password" ng-model="$ctrl.model.Password" required />
     </div>
diff --git a/app/portainer/views/registries/edit/registry.html b/app/portainer/views/registries/edit/registry.html
index 249336c42..9ce9796f9 100644
--- a/app/portainer/views/registries/edit/registry.html
+++ b/app/portainer/views/registries/edit/registry.html
@@ -60,7 +60,7 @@
             <!-- credentials-password -->
             <div class="form-group">
               <label for="credentials_password" class="col-sm-3 col-lg-2 control-label text-left">
-                {{ registry.Type === RegistryTypes.ECR ? 'AWS Secret Access Key' : 'Password' }}
+                {{ passwordLabel() }}
               </label>
               <div class="col-sm-9 col-lg-10">
                 <input type="password" class="form-control" id="credentials_password" ng-model="formValues.Password" placeholder="*******" />
diff --git a/app/portainer/views/registries/edit/registryController.js b/app/portainer/views/registries/edit/registryController.js
index 2ea6d5784..c518c4c30 100644
--- a/app/portainer/views/registries/edit/registryController.js
+++ b/app/portainer/views/registries/edit/registryController.js
@@ -16,6 +16,18 @@ angular.module('portainer.app').controller('RegistryController', [
 
     $scope.RegistryTypes = RegistryTypes;
 
+    $scope.passwordLabel = () => {
+      const type = $scope.registry.Type;
+      switch (type) {
+        case RegistryTypes.ECR:
+          return 'AWS Secret Access Key';
+        case RegistryTypes.DOCKERHUB:
+          return 'Access token';
+        default:
+          return 'Password';
+      }
+    };
+
     $scope.updateRegistry = function () {
       var registry = $scope.registry;
       registry.Password = $scope.formValues.Password;