diff --git a/src/app/view/hce-registration/hce-registration.html b/src/app/view/hce-registration/hce-registration.html
index 178e8bf085..17eef4d738 100644
--- a/src/app/view/hce-registration/hce-registration.html
+++ b/src/app/view/hce-registration/hce-registration.html
@@ -1,17 +1,18 @@
 <div class="hce-registration">
-  <div class="modal-body">
     <form name="hceRegistrationForm">
     <div class="form-group" focusable-input
-         ng-class="{'has-error': addClusterFormCtrl.addClusterForm.url.$invalid && addClusterFormCtrl.addClusterForm.url.$dirty}">
+         ng-class="{'has-error': hceRegistrationForm.url.$invalid && hceRegistrationForm.url.$dirty}">
       <label class="control-label" translate>Code Engine Endpoint</label>
       <input type="text" name="url" class="form-control" ng-model="detailViewCtrl.context.data.url"
-             required />
+             required
+             ng-pattern="/^http(s)?://(.)+$/"
+             helion-unique items="detailViewCtrl.context.options.instances"
+             ignore-case/>
     </div>
     <div class="form-group" focusable-input>
       <label class="control-label" translate>Code Engine Name</label>
       <input type="text" class="form-control" ng-model="detailViewCtrl.context.data.name" required/>
     </div>
-  </div>
   </form>
 
   <div class="modal-footer">
@@ -20,8 +21,8 @@
       {{ 'Cancel' }}
     </button>
     <button class="btn btn-primary"
-            ng-click="$close();">
+            ng-disabled="hceRegistrationForm.$invalid" ng-click="$close();">
       {{ 'Register' }}
     </button>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/view/service-registration/service-registration.directive.js b/src/app/view/service-registration/service-registration.directive.js
index ce4b144ecc..744714ca38 100644
--- a/src/app/view/service-registration/service-registration.directive.js
+++ b/src/app/view/service-registration/service-registration.directive.js
@@ -1,4 +1,4 @@
-(function () {
+(function() {
   'use strict';
 
   angular
@@ -61,7 +61,7 @@
     this.credentialsFormOpen = false;
     this.warningMsg = gettext('Authentication failed, please try reconnect.');
     this.detailView = detailView;
-
+    this.currentEndpoints = [];
     // TODO(woodnt): There must be a more reproducable/general way of doing this. https://jira.hpcloud.net/browse/TEAMFOUR-626
     this.cfModel = modelManager.retrieve('cloud-foundry.model.application');
 
@@ -78,7 +78,17 @@
       });
     });
 
-    this.userCnsiModel.list().then(function () {
+    $scope.$watchCollection(function() {
+      return that.serviceInstances;
+    }, function(newCnsis) {
+      that.currentEndpoints = _.map(newCnsis,
+        function(c) {
+          var endpoint = c.api_endpoint;
+          return endpoint.Scheme + '://' + endpoint.Host;
+        });
+    });
+
+    this.userCnsiModel.list().then(function() {
       angular.extend(that.serviceInstances, that.userCnsiModel.serviceInstances);
       that.cnsiModel.list();
     });
@@ -183,6 +193,7 @@
       // This code is shamelessly copied from app/view/cluster-registration/cluster-registration.directive.js
       // I take that back, it was EXTREMELY SHAMEFUL.
       // -- woodnt
+
       var that = this;
       var data = { name: '', url: '' };
       this.detailView(
@@ -191,7 +202,10 @@
           title: gettext('Register Code Engine Endpoint')
         },
         {
-          data: data
+          data: data,
+          options: {
+            instances: this.currentEndpoints
+          }
         }
       ).result.then(function () {
         return that.serviceInstanceApi.createHCE(data.url, data.name).then(function () {