diff --git a/app/docker/services/imageService.js b/app/docker/services/imageService.js
index 8bc1f8705..652b20541 100644
--- a/app/docker/services/imageService.js
+++ b/app/docker/services/imageService.js
@@ -154,8 +154,7 @@ angular.module('portainer.docker')
    * ! PULL IMAGE
    */
 
-  service.tagImage = function(id, image, registry) {
-    void registry;
+  service.tagImage = function(id, image) {
     return Image.tag({id: id, repo: image}).$promise;
   };
 
diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html
index 15493d812..db132dc40 100644
--- a/app/docker/views/images/edit/image.html
+++ b/app/docker/views/images/edit/image.html
@@ -77,7 +77,7 @@
           <!-- !tag-note -->
           <div class="form-group">
             <div class="col-sm-12">
-              <button type="button" class="btn btn-primary btn-sm" ng-disabled="!formValues.Image" ng-click="tagImage()">Tag</button>
+              <button type="button" class="btn btn-primary btn-sm" ng-disabled="!formValues.RegistryModel.Image" ng-click="tagImage()">Tag</button>
             </div>
           </div>
         </form>
diff --git a/app/docker/views/images/edit/imageController.js b/app/docker/views/images/edit/imageController.js
index 21ddedd16..58dddfc89 100644
--- a/app/docker/views/images/edit/imageController.js
+++ b/app/docker/views/images/edit/imageController.js
@@ -2,8 +2,8 @@ import _ from 'lodash-es';
 import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
 
 angular.module('portainer.docker')
-.controller('ImageController', ['$q', '$scope', '$transition$', '$state', '$timeout', 'ImageService', 'RegistryService', 'Notifications', 'HttpRequestHelper', 'ModalService', 'FileSaver', 'Blob',
-function ($q, $scope, $transition$, $state, $timeout, ImageService, RegistryService, Notifications, HttpRequestHelper, ModalService, FileSaver, Blob) {
+.controller('ImageController', ['$q', '$scope', '$transition$', '$state', '$timeout', 'ImageService', 'ImageHelper', 'RegistryService', 'Notifications', 'HttpRequestHelper', 'ModalService', 'FileSaver', 'Blob',
+function ($q, $scope, $transition$, $state, $timeout, ImageService, ImageHelper, RegistryService, Notifications, HttpRequestHelper, ModalService, FileSaver, Blob) {
 	$scope.formValues = {
 		RegistryModel: new PorImageRegistryModel()
 	};
@@ -26,12 +26,12 @@ function ($q, $scope, $transition$, $state, $timeout, ImageService, RegistryServ
 		$('#layer-command-'+layerId+'-full').toggle();
 	};
 
-	// TODO CHANGE
 	$scope.tagImage = function() {
-		var image = $scope.formValues.Image;
-		var registry = $scope.formValues.Registry;
+		const registryModel = $scope.formValues.RegistryModel;
 
-		ImageService.tagImage($transition$.params().id, image, registry.URL)
+		const image = ImageHelper.createImageConfigForContainer(registryModel);
+
+		ImageService.tagImage($transition$.params().id, image.fromImage)
 		.then(function success() {
 			Notifications.success('Image successfully tagged');
 			$state.go('docker.images.image', {id: $transition$.params().id}, {reload: true});