diff --git a/app/docker/views/services/create/createServiceController.js b/app/docker/views/services/create/createServiceController.js
index 810a0cd7b..477fb6f65 100644
--- a/app/docker/views/services/create/createServiceController.js
+++ b/app/docker/views/services/create/createServiceController.js
@@ -159,7 +159,6 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C
     $scope.formValues.LogDriverOpts.splice(index, 1);
   };
 
-  // TODO CHANGE
   function prepareImageConfig(config, input) {
     var imageConfig = ImageHelper.createImageConfigForContainer(input.RegistryModel);
     config.TaskTemplate.ContainerSpec.Image = imageConfig.fromImage;
@@ -427,11 +426,9 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C
     return config;
   }
 
-  // TODO CHANGE
   function createNewService(config, accessControlData) {
-
-    var registry = $scope.formValues.Registry;
-    var authenticationDetails = registry.Authentication ? RegistryService.encodedCredentials(registry) : '';
+    const registryModel = $scope.formValues.RegistryModel;
+    var authenticationDetails = registryModel.Registry.Authentication ? RegistryService.encodedCredentials(registryModel.Registry) : '';
     HttpRequestHelper.setRegistryAuthenticationHeader(authenticationDetails);
 
     Service.create(config).$promise
diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html
index 58fefef8a..e3e44b6c6 100644
--- a/app/docker/views/services/create/createservice.html
+++ b/app/docker/views/services/create/createservice.html
@@ -125,7 +125,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="create()" button-spinner="state.actionInProgress">
+              <button type="button" class="btn btn-primary btn-sm" ng-disabled="state.actionInProgress || !formValues.RegistryModel.Image" ng-click="create()" button-spinner="state.actionInProgress">
                 <span ng-hide="state.actionInProgress">Create the service</span>
                 <span ng-show="state.actionInProgress">Creating service...</span>
               </button>
diff --git a/app/portainer/services/api/registryService.js b/app/portainer/services/api/registryService.js
index cdcdeefef..112a9b00e 100644
--- a/app/portainer/services/api/registryService.js
+++ b/app/portainer/services/api/registryService.js
@@ -111,5 +111,3 @@ function RegistryServiceFactory($q, $async, Registries, DockerHubService, ImageH
 
   return service;
 }]);
-
-// retrieveRegistryFromRepository
\ No newline at end of file