diff --git a/ui/src/app/edge/edge-fieldset.tpl.html b/ui/src/app/edge/edge-fieldset.tpl.html
index 05b4742f82..42eee537b0 100644
--- a/ui/src/app/edge/edge-fieldset.tpl.html
+++ b/ui/src/app/edge/edge-fieldset.tpl.html
@@ -102,14 +102,6 @@
                 ng-model="edge.type"
                 entity-type="types.entityType.edge">
         </tb-entity-subtype-autocomplete>
-        <md-input-container class="md-block">
-            <label translate>edge.label</label>
-            <input name="label" ng-model="edge.label">
-        </md-input-container>
-        <md-input-container class="md-block">
-            <label translate>edge.description</label>
-            <textarea ng-model="edge.additionalInfo.description" rows="2"></textarea>
-        </md-input-container>
         <md-input-container class="md-block">
             <label translate>edge.edge-license-key</label>
             <input required name="edgeLicenseKey" ng-model="edge.edgeLicenseKey">
@@ -126,7 +118,6 @@
         </md-input-container>
     </fieldset>
     <div layout="row">
-
         <md-input-container class="md-block" flex>
             <label translate>edge.edge-key</label>
             <input ng-model="edge.routingKey" disabled>
@@ -156,4 +147,14 @@
             </md-tooltip>
         </md-button>
     </div>
+    <div layout="row">
+        <md-input-container class="md-block">
+            <label translate>edge.label</label>
+            <input name="label" ng-model="edge.label">
+        </md-input-container>
+        <md-input-container class="md-block">
+            <label translate>edge.description</label>
+            <textarea ng-model="edge.additionalInfo.description" rows="2"></textarea>
+        </md-input-container>
+    </div>
 </md-content>
diff --git a/ui/src/app/edge/edge.directive.js b/ui/src/app/edge/edge.directive.js
index bdd3b44b67..a1efa67197 100644
--- a/ui/src/app/edge/edge.directive.js
+++ b/ui/src/app/edge/edge.directive.js
@@ -36,6 +36,7 @@ export default function EdgeDirective($compile, $templateCache, $translate, $mdD
                     scope.edge.routingKey = utils.guid('');
                     scope.edge.secret = generateSecret(20);
                     scope.edge.cloudEndpoint = utils.baseUrl();
+                    scope.edge.type = 'default';
                 }
                 if (scope.edge.customerId && scope.edge.customerId.id !== types.id.nullUid) {
                     scope.isAssignedToCustomer = true;
diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json
index 3bafe1813d..343ead0099 100644
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@@ -457,7 +457,7 @@
         "select-default-customer": "Select default customer",
         "default-customer": "Default customer",
         "default-customer-required": "Default customer is required in order to debug dashboard on Tenant level",
-        "edges": "Customer Edges"
+        "edges": "Customer edge instances"
     },
     "datetime": {
         "date-from": "Date from",