diff --git a/app/docker/views/images/images.html b/app/docker/views/images/images.html
index eae073142..c71bc8cbf 100644
--- a/app/docker/views/images/images.html
+++ b/app/docker/views/images/images.html
@@ -21,11 +21,16 @@
           ></por-image-registry>
           <!-- !image-and-registry -->
           <!-- tag-note -->
-          <div class="form-group">
+          <div class="form-group" ng-if="formValues.RegistryModel.UseRegistry">
             <div class="col-sm-12">
               <span class="small text-muted">Note: if you don't specify the tag in the image name, <span class="label label-default">latest</span> will be used.</span>
             </div>
           </div>
+          <div class="form-group" ng-if="!formValues.RegistryModel.UseRegistry">
+            <div class="col-sm-12">
+              <span class="small text-muted"><i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i> WARNING: if you don't specify the tag in the image name, all tags will be pulled for the image.</span>
+            </div>
+          </div>
           <!-- !tag-note -->
           <div ng-if="applicationState.endpoint.mode.agentProxy && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE'">
             <div class="col-sm-12 form-section-title">
@@ -39,7 +44,7 @@
           </div>
           <div class="form-group">
             <div class="col-sm-12">
-              <button type="button" class="btn btn-primary btn-sm" ng-disabled="state.actionInProgress || !formValues.Image" ng-click="pullImage()" button-spinner="state.actionInProgress">
+              <button type="button" class="btn btn-primary btn-sm" ng-disabled="state.actionInProgress || !formValues.RegistryModel.Image" ng-click="pullImage()" button-spinner="state.actionInProgress">
                 <span ng-hide="state.actionInProgress">Pull the image</span>
                 <span ng-show="state.actionInProgress">Download in progress...</span>
               </button>
diff --git a/app/docker/views/images/imagesController.js b/app/docker/views/images/imagesController.js
index c3bc3c54c..aed6f8cf6 100644
--- a/app/docker/views/images/imagesController.js
+++ b/app/docker/views/images/imagesController.js
@@ -14,7 +14,6 @@ function ($scope, $state, ImageService, Notifications, ModalService, HttpRequest
     NodeName: null
   };
 
-  // TODO CHANGE
   $scope.pullImage = function() {
     const registryModel = $scope.formValues.RegistryModel;