diff --git a/app/components/createContainer/createcontainer.html b/app/components/createContainer/createcontainer.html
index a90f8da59..c784d7517 100644
--- a/app/components/createContainer/createcontainer.html
+++ b/app/components/createContainer/createcontainer.html
@@ -28,7 +28,7 @@
           <div ng-if="formValues.Registry || !fromContainer">
             <!-- image-and-registry -->
             <div class="form-group">
-              <por-image-registry image="config.Image" registry="formValues.Registry" ng-if="formValues.Registry" auto-complete="true"></por-image-registry>
+              <por-image-registry image="config.Image" registry="formValues.Registry" ng-if="formValues.Registry"></por-image-registry>
             </div>
             <!-- !image-and-registry -->
             <!-- always-pull -->
diff --git a/app/components/createService/createservice.html b/app/components/createService/createservice.html
index 3368ae1c6..14467cfd0 100644
--- a/app/components/createService/createservice.html
+++ b/app/components/createService/createservice.html
@@ -25,7 +25,7 @@
           </div>
           <!-- image-and-registry -->
           <div class="form-group">
-            <por-image-registry image="formValues.Image" registry="formValues.Registry" auto-complete="true"></por-image-registry>
+            <por-image-registry image="formValues.Image" registry="formValues.Registry"></por-image-registry>
           </div>
           <!-- !image-and-registry -->
           <div class="col-sm-12 form-section-title">
diff --git a/app/directives/imageRegistry/por-image-registry.js b/app/directives/imageRegistry/por-image-registry.js
index ccc65cdc9..f8d004967 100644
--- a/app/directives/imageRegistry/por-image-registry.js
+++ b/app/directives/imageRegistry/por-image-registry.js
@@ -3,7 +3,6 @@ angular.module('portainer').component('porImageRegistry', {
   controller: 'porImageRegistryController',
   bindings: {
     'image': '=',
-    'registry': '=',
-    'autoComplete': '<'
+    'registry': '='
   }
 });
diff --git a/app/directives/imageRegistry/porImageRegistry.html b/app/directives/imageRegistry/porImageRegistry.html
index 06fc192e9..3f1dbcd43 100644
--- a/app/directives/imageRegistry/porImageRegistry.html
+++ b/app/directives/imageRegistry/porImageRegistry.html
@@ -1,9 +1,7 @@
 <div>
   <label for="image_name" class="col-sm-1 control-label text-left">Name</label>
   <div class="col-sm-11 col-md-6">
-    <input type="text" class="form-control"
-      uib-typeahead="image for image in $ctrl.availableImages | filter:$viewValue | limitTo:5" 
-      ng-model="$ctrl.image" id="image_name" placeholder="e.g. myImage:myTag">
+    <input type="text" class="form-control" ng-model="$ctrl.image" id="image_name" placeholder="e.g. myImage:myTag">
   </div>
   <label for="image_registry" class="col-sm-2 col-md-1 margin-sm-top control-label text-left">
     Registry
diff --git a/app/directives/imageRegistry/porImageRegistryController.js b/app/directives/imageRegistry/porImageRegistryController.js
index a2d2bc43e..496209be7 100644
--- a/app/directives/imageRegistry/porImageRegistryController.js
+++ b/app/directives/imageRegistry/porImageRegistryController.js
@@ -1,21 +1,16 @@
 angular.module('portainer')
-.controller('porImageRegistryController', ['$q', 'RegistryService', 'DockerHubService', 'ImageService', 'Notifications',
-function ($q, RegistryService, DockerHubService, ImageService, Notifications) {
+.controller('porImageRegistryController', ['$q', 'RegistryService', 'DockerHubService', 'Notifications',
+function ($q, RegistryService, DockerHubService, Notifications) {
   var ctrl = this;
-  ctrl.availableImages = [];
-  
+
   function initComponent() {
     $q.all({
       registries: RegistryService.registries(),
-      dockerhub: DockerHubService.dockerhub(),
-      availableImages: ctrl.autoComplete ? ImageService.images() : []
+      dockerhub: DockerHubService.dockerhub()
     })
     .then(function success(data) {
       var dockerhub = data.dockerhub;
       var registries = data.registries;
-      ctrl.availableImages = _.flatten(_.map(data.availableImages, function (image) {
-        return image.RepoTags ? image.RepoTags : [];
-      }));
       ctrl.availableRegistries = [dockerhub].concat(registries);
       if (!ctrl.registry.Id) {
         ctrl.registry = dockerhub;