diff --git a/app/docker/components/imageRegistry/por-image-registry.js b/app/docker/components/imageRegistry/por-image-registry.js
index 13a75671e..39d6a5919 100644
--- a/app/docker/components/imageRegistry/por-image-registry.js
+++ b/app/docker/components/imageRegistry/por-image-registry.js
@@ -3,6 +3,7 @@ angular.module('portainer.docker').component('porImageRegistry', {
   controller: 'porImageRegistryController',
   bindings: {
     'model': '=', // must be of type PorImageRegistryModel
+    'pullWarning': '<',
     'autoComplete': '<',
     'labelClass': '@',
     'inputClass': '@'
diff --git a/app/docker/components/imageRegistry/porImageRegistry.html b/app/docker/components/imageRegistry/porImageRegistry.html
index fe909247f..bcb280d96 100644
--- a/app/docker/components/imageRegistry/porImageRegistry.html
+++ b/app/docker/components/imageRegistry/porImageRegistry.html
@@ -1,20 +1,10 @@
-<div class="form-group">
-  <div class="col-sm-12">
-    <label for="use_registry" class="control-label text-left">
-      Use registry
-    </label>
-    <label class="switch" style="margin-left: 20px;">
-      <input type="checkbox" ng-model="$ctrl.model.UseRegistry"><i></i>
-    </label>
-  </div>
-</div>
 <!-- use registry -->
 <div ng-if="$ctrl.model.UseRegistry">
   <div class="form-group">
     <label for="image_name" ng-class="$ctrl.labelClass" class="control-label text-left">Image</label>
     <div ng-class="$ctrl.inputClass">
       <div class="input-group">
-        <span class="input-group-addon" id="registry-name">{{$ctrl.model.Registry.URL}}</span>
+        <span class="input-group-addon" id="registry-name">{{$ctrl.model.Registry.URL || 'docker.io'}}</span>
         <input type="text" class="form-control" aria-describedby="registry-name" uib-typeahead="image for image in $ctrl.availableImages | filter:$viewValue | limitTo:5"
         ng-model="$ctrl.model.Image" name="image_name" placeholder="e.g. myImage:myTag" required>
       </div>
@@ -23,8 +13,8 @@
       Registry
     </label>
     <div ng-class="$ctrl.inputClass" class="margin-sm-top">
-      <select ng-options="registry as registry.Name for registry in $ctrl.availableRegistries" ng-model="$ctrl.model.Registry" id="image_registry"
-        class="form-control"></select>
+      <select ng-options="registry as registry.Name for registry in $ctrl.availableRegistries track by registry.Name" ng-model="$ctrl.model.Registry" id="image_registry"
+        selected-item-id="ctrl.selectedItemId" class="form-control"></select>
     </div>
   </div>
 </div>
@@ -45,8 +35,20 @@
 <div class="form-group" ng-show="$ctrl.form.image_name.$invalid">
   <div class="col-sm-12 small text-warning">
     <div ng-messages="$ctrl.form.image_name.$error">
-      <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Image name is required.</p>
+      <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Image name is required. <span ng-if="$ctrl.canPull">Tag must be specified otherwise Portainer will pull all tags associated to the image.</span></p>
     </div>
   </div>
 </div>
 <!-- ! info message -->
+<div class="form-group">
+  <div class="col-sm-12">
+    <p>
+      <a class="small interactive" ng-if="!$ctrl.model.UseRegistry" ng-click="$ctrl.model.UseRegistry = true;">
+        <i class="fa fa-database space-right" aria-hidden="true"></i> Use specific registry
+      </a>
+      <a class="small interactive" ng-if="$ctrl.model.UseRegistry" ng-click="$ctrl.model.UseRegistry = false;">
+        <i class="fa fa-globe space-right" aria-hidden="true"></i> Use public registry
+      </a>
+    </p>
+  </div>
+</div>
diff --git a/app/docker/components/imageRegistry/porImageRegistryController.js b/app/docker/components/imageRegistry/porImageRegistryController.js
index 06b10c0b9..d6f6e5010 100644
--- a/app/docker/components/imageRegistry/porImageRegistryController.js
+++ b/app/docker/components/imageRegistry/porImageRegistryController.js
@@ -21,7 +21,7 @@ class porImageRegistryController {
         this.autoComplete ? this.ImageService.images() : []
       ]);
       this.availableImages = this.ImageService.getUniqueTagListFromImages(availableImages);
-      this.availableRegistries = [dockerhub].concat(registries);
+      this.availableRegistries = _.concat(dockerhub, registries);
 
       const id = this.model.Registry.Id;
       if (!id) {
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html
index ec3e77e14..2d5d13b3c 100644
--- a/app/docker/views/containers/create/createcontainer.html
+++ b/app/docker/views/containers/create/createcontainer.html
@@ -29,20 +29,11 @@
             <!-- image-and-registry -->
             <por-image-registry
               model="formValues.RegistryModel"
+              pull-warning="formValues.alwaysPull"
               ng-if="formValues.RegistryModel.Registry"
               auto-complete="true"
               label-class="col-sm-1" input-class="col-sm-11 col-md-5"
             ></por-image-registry>
-            <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.alwaysPull && !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 unless you don't ask Portainer to pull the image.</span>
-              </div>
-            </div>
             <!-- !image-and-registry -->
             <!-- always-pull -->
             <div class="form-group">
diff --git a/app/docker/views/images/images.html b/app/docker/views/images/images.html
index c71bc8cbf..6e883deff 100644
--- a/app/docker/views/images/images.html
+++ b/app/docker/views/images/images.html
@@ -17,21 +17,10 @@
           <!-- image-and-registry -->
           <por-image-registry
             model="formValues.RegistryModel"
+            pull-warning="true"
             label-class="col-sm-1" input-class="col-sm-11 col-md-5"
           ></por-image-registry>
           <!-- !image-and-registry -->
-          <!-- tag-note -->
-          <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">
               Deployment
diff --git a/app/docker/views/services/edit/includes/image.html b/app/docker/views/services/edit/includes/image.html
index f43353027..1b8a8754e 100644
--- a/app/docker/views/services/edit/includes/image.html
+++ b/app/docker/views/services/edit/includes/image.html
@@ -9,11 +9,6 @@
           auto-complete="true"
           label-class="col-sm-1" input-class="col-sm-11 col-md-5"
         ></por-image-registry>
-        <div class="form-group">
-          <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>
       </form>
     </rd-widget-body>
     <rd-widget-body ng-if="isUpdating">
diff --git a/app/portainer/models/dockerhub.js b/app/portainer/models/dockerhub.js
index 81213cf41..880a89f5b 100644
--- a/app/portainer/models/dockerhub.js
+++ b/app/portainer/models/dockerhub.js
@@ -1,7 +1,6 @@
 export function DockerHubViewModel(data) {
   this.Name = 'DockerHub';
-  this.URL = 'docker.io';
-  // this.URL = '';
+  this.URL = '';
   this.Authentication = data.Authentication;
   this.Username = data.Username;
   this.Password = data.Password;
diff --git a/app/portainer/services/api/registryService.js b/app/portainer/services/api/registryService.js
index 8b19cc3bd..d2c7704be 100644
--- a/app/portainer/services/api/registryService.js
+++ b/app/portainer/services/api/registryService.js
@@ -83,7 +83,7 @@ function RegistryServiceFactory($q, $async, Registries, DockerHubService, ImageH
 
   service.retrievePorRegistryModelFromRepositoryWithRegistries = retrievePorRegistryModelFromRepositoryWithRegistries;
 
-  function retrievePorRegistryModelFromRepositoryWithRegistries(repository, registries) {
+  function retrievePorRegistryModelFromRepositoryWithRegistries(repository, registries, dockerhub) {
     const model = new PorImageRegistryModel();
     const registry = _.find(registries, (reg) => _.includes(repository, reg.URL));
     if (registry) {
@@ -93,6 +93,7 @@ function RegistryServiceFactory($q, $async, Registries, DockerHubService, ImageH
       model.Image = image;
     } else {
       model.UseRegistry = false;
+      model.Registry = dockerhub;
       model.Image = repository;
     }
     return model;
@@ -100,12 +101,11 @@ function RegistryServiceFactory($q, $async, Registries, DockerHubService, ImageH
 
   async function retrievePorRegistryModelFromRepositoryAsync(repository) {
     try {
-      const [registries, dockerhub] = await Promise.all([
+      let [registries, dockerhub] = await Promise.all([
         service.registries(),
         DockerHubService.dockerhub()
       ]);
-      registries.concat([dockerhub]);
-      return retrievePorRegistryModelFromRepositoryWithRegistries(repository, registries);
+      return retrievePorRegistryModelFromRepositoryWithRegistries(repository, registries, dockerhub);
     } catch (err) {
       throw { msg: 'Unable to retrieve the registry associated to the repository', err: err }
     }
diff --git a/app/portainer/services/api/templateService.js b/app/portainer/services/api/templateService.js
index a94c46d82..ae328ce23 100644
--- a/app/portainer/services/api/templateService.js
+++ b/app/portainer/services/api/templateService.js
@@ -19,10 +19,9 @@ function TemplateServiceFactory($q, Templates, TemplateHelper, RegistryService,
       dockerhub: DockerHubService.dockerhub()
     })
     .then(function success(data) {
-      data.registries.concat([data.dockerhub]);
       const templates = data.templates.map(function (item) {
         const res = new TemplateViewModel(item);
-        const registry = RegistryService.retrievePorRegistryModelFromRepositoryWithRegistries(res.RegistryModel.Registry, data.registries);
+        const registry = RegistryService.retrievePorRegistryModelFromRepositoryWithRegistries(res.RegistryModel.Registry, data.registries, data.dockerhub);
         registry.Image = res.RegistryModel.Image;
         res.RegistryModel = registry;
         return res;