diff --git a/lemur/certificates/service.py b/lemur/certificates/service.py
index 08d23054..00669b34 100644
--- a/lemur/certificates/service.py
+++ b/lemur/certificates/service.py
@@ -248,6 +248,10 @@ def create(**kwargs):
 
     cert.owner = kwargs['owner']
 
+    # we override the generated name if one is provided
+    if kwargs.get('name'):
+        cert.name = kwargs['name']
+
     database.create(cert)
     cert.description = kwargs['description']
     g.user.certificates.append(cert)
diff --git a/lemur/certificates/views.py b/lemur/certificates/views.py
index dd28f21e..cd2439b5 100644
--- a/lemur/certificates/views.py
+++ b/lemur/certificates/views.py
@@ -201,7 +201,8 @@ class CertificatesList(AuthenticatedResource):
                 "validityEnd": "2015-06-16T07:00:00.000Z",
                 "replacements": [
                     {'id': 123}
-                ]
+                ],
+                "name": "TestCertificate"
              }
 
            **Example response**:
diff --git a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html
index 54176eae..6477b49f 100644
--- a/lemur/static/app/angular/certificates/certificate/tracking.tpl.html
+++ b/lemur/static/app/angular/certificates/certificate/tracking.tpl.html
@@ -1,140 +1,155 @@
 <form name="trackingForm" novalidate>
-  <div class="form-horizontal">
-    <div class="form-group"
-         ng-class="{'has-error': trackingForm.ownerEmail.$invalid, 'has-success': !trackingForm.$invalid&&trackingForm.ownerEmail.$dirty}">
-      <label class="control-label col-sm-2">
-        Owner
-      </label>
+    <div class="form-horizontal">
+        <div class="form-group"
+             ng-class="{'has-error': trackingForm.ownerEmail.$invalid, 'has-success': !trackingForm.$invalid&&trackingForm.ownerEmail.$dirty}">
+            <label class="control-label col-sm-2">
+                Owner
+            </label>
 
-      <div class="col-sm-10">
-        <input type="email" name="ownerEmail" ng-model="certificate.owner" placeholder="TeamDL@example.com"
-               tooltip="This is the certificates team distribution list or main point of contact" class="form-control"
-               required/>
+            <div class="col-sm-10">
+                <input type="email" name="ownerEmail" ng-model="certificate.owner" placeholder="TeamDL@example.com"
+                       tooltip="This is the certificates team distribution list or main point of contact"
+                       class="form-control"
+                       required/>
 
-        <p ng-show="trackingForm.ownerEmail.$invalid && !trackingForm.ownerEmail.$pristine" class="help-block">You must
-          enter an Certificate owner</p>
-      </div>
-    </div>
-    <div class="form-group"
-         ng-class="{'has-error': trackingForm.description.$invalid, 'has-success': !trackingForm.$invalid&&trackingForm.description.$dirty}">
-      <label class="control-label col-sm-2">
-        Description
-      </label>
+                <p ng-show="trackingForm.ownerEmail.$invalid && !trackingForm.ownerEmail.$pristine" class="help-block">
+                    You must enter an Certificate owner</p>
+            </div>
+        </div>
+        <div class="form-group"
+             ng-class="{'has-error': trackingForm.name.$invalid, 'has-success': !trackingForm.name.$invalid&&trackingForm.name.$dirty}">
+            <label class="control-label col-sm-2" tooltip="If no name is provided, Lemur will generate a name for you">
+                Custom Name <span class="glyphicon glyphicon-question-sign"></span>
+            </label>
+            <div class="col-sm-10">
+                <input name="name" ng-model="certificate.name"
+                       placeholder="the.example.net-SymantecCorporation-20150828-20160830" class="form-control"/>
+            </div>
+        </div>
+        <div class="form-group"
+             ng-class="{'has-error': trackingForm.description.$invalid, 'has-success': !trackingForm.$invalid&&trackingForm.description.$dirty}">
+            <label class="control-label col-sm-2">
+                Description
+            </label>
 
-      <div class="col-sm-10">
+            <div class="col-sm-10">
         <textarea name="description" ng-model="certificate.description" placeholder="Something elegant"
                   class="form-control" required></textarea>
 
-        <p ng-show="trackingForm.description.$invalid && !trackingForm.description.$pristine" class="help-block">You
-          must give a short description about this authority will be used for.</p>
-      </div>
-    </div>
-    <div class="form-group"
-         ng-class="{'has-error': trackingForm.selectedAuthority.$invalid, 'has-success': !trackingForm.$invalid&&trackingForm.selectedAuthority.$dirty}">
-      <label class="control-label col-sm-2">
-        Certificate Authority
-      </label>
-
-      <div class="col-sm-10">
-        <div class="input-group col-sm-12">
-          <input name="selectedAuthority"
-                 tooltip="If you are unsure which authority you need; you most likely want to use 'verisign'"
-                 type="text" ng-model="certificate.selectedAuthority" placeholder="Authority Name"
-                 typeahead-on-select="certificate.attachAuthority($item)"
-                 typeahead="authority.name for authority in authorityService.findActiveAuthorityByName($viewValue)"
-                 typeahead-loading="loadingAuthorities"
-                 class="form-control" typeahead-wait-ms="1000"
-                 typeahead-template-url="angular/authorities/authority/select.tpl.html" required>
+                <p ng-show="trackingForm.description.$invalid && !trackingForm.description.$pristine"
+                   class="help-block">You
+                    must give a short description about this authority will be used for.</p>
+            </div>
         </div>
-      </div>
-    </div>
-    <div class="form-group">
-      <label class="control-label col-sm-2">
-        Certificate Template
-      </label>
+        <div class="form-group"
+             ng-class="{'has-error': trackingForm.selectedAuthority.$invalid, 'has-success': !trackingForm.$invalid&&trackingForm.selectedAuthority.$dirty}">
+            <label class="control-label col-sm-2">
+                Certificate Authority
+            </label>
 
-      <div class="col-sm-10">
-        <select class="form-control" ng-change="certificate.useTemplate()" name="certificateTemplate"
-                ng-model="certificate.template" ng-options="template.name for template in templates"></select>
-      </div>
-    </div>
-    <div class="form-group"
-         ng-class="{'has-error': trackingForm.commonName.$invalid, 'has-success': !trackingForm.$invalid&&trackingForm.commonName.$dirty}">
-      <label class="control-label col-sm-2">
-        Common Name
-      </label>
+            <div class="col-sm-10">
+                <div class="input-group col-sm-12">
+                    <input name="selectedAuthority"
+                           tooltip="If you are unsure which authority you need; you most likely want to use 'verisign'"
+                           type="text" ng-model="certificate.selectedAuthority" placeholder="Authority Name"
+                           typeahead-on-select="certificate.attachAuthority($item)"
+                           typeahead="authority.name for authority in authorityService.findActiveAuthorityByName($viewValue)"
+                           typeahead-loading="loadingAuthorities"
+                           class="form-control" typeahead-wait-ms="1000"
+                           typeahead-template-url="angular/authorities/authority/select.tpl.html" required>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label col-sm-2">
+                Certificate Template
+            </label>
 
-      <div class="col-sm-10">
-        <input name="commonName"
-               tooltip="If you need a certificate with multiple domains enter your primary domain here and the rest under 'Subject Alternate Names' in the next few panels"
-               ng-model="certificate.commonName" placeholder="Common Name" class="form-control" ng-maxlength="64"
-               required/>
+            <div class="col-sm-10">
+                <select class="form-control" ng-change="certificate.useTemplate()" name="certificateTemplate"
+                        ng-model="certificate.template" ng-options="template.name for template in templates"></select>
+            </div>
+        </div>
+        <div class="form-group"
+             ng-class="{'has-error': trackingForm.commonName.$invalid, 'has-success': !trackingForm.$invalid&&trackingForm.commonName.$dirty}">
+            <label class="control-label col-sm-2">
+                Common Name
+            </label>
 
-        <p ng-show="trackingForm.commonName.$invalid && !trackingForm.commonName.$pristine" class="help-block">You must
-          enter a common name and it must be less than 64 characters</p>
-      </div>
-    </div>
-    <div class="form-group">
-      <label class="control-label col-sm-2"
-             tooltip="If no date is selected Lemur attempts to issue a 2 year certificate">
-        Validity Range <span class="glyphicon glyphicon-question-sign"></span>
-      </label>
-      <div class="col-sm-2">
-        <select ng-model="certificate.validityYears" class="form-control">
-          <option value="1">1 year</option>
-          <option value="2">2 years</option>
-          <option value="3">3 years</option>
-          <option value="4">4 years</option>
-        </select>
-      </div>
+            <div class="col-sm-10">
+                <input name="commonName"
+                       tooltip="If you need a certificate with multiple domains enter your primary domain here and the rest under 'Subject Alternate Names' in the next few panels"
+                       ng-model="certificate.commonName" placeholder="Common Name" class="form-control"
+                       ng-maxlength="64"
+                       required/>
+
+                <p ng-show="trackingForm.commonName.$invalid && !trackingForm.commonName.$pristine" class="help-block">
+                    You must
+                    enter a common name and it must be less than 64 characters</p>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="control-label col-sm-2"
+                   tooltip="If no date is selected Lemur attempts to issue a 2 year certificate">
+                Validity Range <span class="glyphicon glyphicon-question-sign"></span>
+            </label>
+            <div class="col-sm-2">
+                <select ng-model="certificate.validityYears" class="form-control">
+                    <option value="1">1 year</option>
+                    <option value="2">2 years</option>
+                    <option value="3">3 years</option>
+                    <option value="4">4 years</option>
+                </select>
+            </div>
       <span style="padding-top: 15px" class="text-center col-sm-1">
         <strong>- or -</strong>
       </span>
-      <div class="col-sm-3">
-        <div class="input-group">
-          <input tooltip="Starting Date (yyyy/MM/dd)" class="form-control" datepicker-popup="yyyy/MM/dd"
-                 is-open="$parent.openNotBefore.isOpen" min-date="certificate.authority.notBefore"
-                 max-date="certificate.authority.maxDate" ng-model="certificate.validityStart"/>
+            <div class="col-sm-3">
+                <div class="input-group">
+                    <input tooltip="Starting Date (yyyy/MM/dd)" class="form-control" datepicker-popup="yyyy/MM/dd"
+                           is-open="$parent.openNotBefore.isOpen" min-date="certificate.authority.notBefore"
+                           max-date="certificate.authority.maxDate" ng-model="certificate.validityStart"/>
         <span class="input-group-btn">
           <button class="btn btn-default" ng-click="openNotBefore($event)"><i
             class="glyphicon glyphicon-calendar"></i></button>
         </span>
-        </div>
-      </div>
+                </div>
+            </div>
       <span style="padding-top: 15px" class="text-center col-sm-1"><label><span
         class="glyphicon glyphicon-resize-horizontal"></span></label></span>
 
-      <div class="col-sm-3">
-        <div>
-          <div class="input-group">
-            <input tooltip="Ending Date (yyyy/MM/dd)" class="form-control" datepicker-popup="yyyy/MM/dd"
-                   is-open="$parent.openNotAfter.isOpen" min-date="certificate.authority.notBefore"
-                   max-date="certificate.authority.maxDate" ng-model="certificate.validityEnd"/>
+            <div class="col-sm-3">
+                <div>
+                    <div class="input-group">
+                        <input tooltip="Ending Date (yyyy/MM/dd)" class="form-control" datepicker-popup="yyyy/MM/dd"
+                               is-open="$parent.openNotAfter.isOpen" min-date="certificate.authority.notBefore"
+                               max-date="certificate.authority.maxDate" ng-model="certificate.validityEnd"/>
             <span class="input-group-btn">
               <button class="btn btn-default" ng-click="openNotAfter($event)"><i
                 class="glyphicon glyphicon-calendar"></i></button>
             </span>
-          </div>
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
-    </div>
-    <div class="form-group"
-         ng-class="{'has-error': trackingForm.csr.$invalid&&trackingForm.csr.$dirty, 'has-success': !trackingForm.csr.$invalid&&trackingForm.csr.$dirty}">
-      <label class="control-label col-sm-2">
-        Certificate Signing Request (CSR)
-      </label>
-      <div class="col-sm-10">
-                <textarea tooltip="Values defined in the CSR will take precedence" name="certificate signing request" ng-model="certificate.csr"
+        <div class="form-group"
+             ng-class="{'has-error': trackingForm.csr.$invalid&&trackingForm.csr.$dirty, 'has-success': !trackingForm.csr.$invalid&&trackingForm.csr.$dirty}">
+            <label class="control-label col-sm-2">
+                Certificate Signing Request (CSR)
+            </label>
+            <div class="col-sm-10">
+                <textarea tooltip="Values defined in the CSR will take precedence" name="certificate signing request"
+                          ng-model="certificate.csr"
                           placeholder="PEM encoded string..." class="form-control"
                           ng-pattern="/^-----BEGIN CERTIFICATE REQUEST-----/"></textarea>
 
-        <p ng-show="trackingForm.csr.$invalid && !trackingForm.csr.$pristine"
-           class="help-block">Enter a valid certificate signing request.</p>
-      </div>
+                <p ng-show="trackingForm.csr.$invalid && !trackingForm.csr.$pristine"
+                   class="help-block">Enter a valid certificate signing request.</p>
+            </div>
+        </div>
+        <div ng-include="'angular/certificates/certificate/replaces.tpl.html'"></div>
+        <div ng-include="'angular/certificates/certificate/notifications.tpl.html'"></div>
+        <div ng-include="'angular/certificates/certificate/destinations.tpl.html'"></div>
     </div>
-    <div ng-include="'angular/certificates/certificate/replaces.tpl.html'"></div>
-    <div ng-include="'angular/certificates/certificate/notifications.tpl.html'"></div>
-    <div ng-include="'angular/certificates/certificate/destinations.tpl.html'"></div>
-  </div>
 </form>