diff --git a/app/certificates/new/controller.js b/app/certificates/new/controller.js
index 4deb78215..caf802799 100644
--- a/app/certificates/new/controller.js
+++ b/app/certificates/new/controller.js
@@ -11,6 +11,10 @@ export default Ember.Controller.extend(NewOrEdit,{
     readFile(field, text) {
       this.set('model.'+field, text.trim());
     },
+
+    cancel() {
+      this.replaceWith('certificates');
+    },
   },
 
   validate() {
diff --git a/app/certificates/new/template.hbs b/app/certificates/new/template.hbs
index f1902b5da..1fd2079a0 100644
--- a/app/certificates/new/template.hbs
+++ b/app/certificates/new/template.hbs
@@ -23,7 +23,7 @@
   <div class="row form-group">
     <div class="col-sm-12 col-md-2 form-label">
       <label>Private Key*</label>
-      {{read-text-file accept="text/*, .pem, .key" action=(action "readFile" "key")}}
+      {{read-text-file accept="text/*, .pem, .pkey, .key" action=(action "readFile" "key")}}
     </div>
     <div class="col-sm-12 col-md-8">
       {{textarea value=model.key classNames="form-control no-resize" rows="5" placeholder="Paste in the private key, starting with -----BEGIN RSA PRIVATE KEY-----"}}
diff --git a/app/certificates/route.js b/app/certificates/route.js
index c939fd108..9d552dc1b 100644
--- a/app/certificates/route.js
+++ b/app/certificates/route.js
@@ -2,6 +2,6 @@ import Ember from 'ember';
 
 export default Ember.Route.extend({
   model: function() {
-    return this.get('store').findAll('certificate');
+    return this.get('store').findAllUnremoved('certificate');
   },
 });
diff --git a/app/components/edit-ssl-termination/template.hbs b/app/components/edit-ssl-termination/template.hbs
index 3d32afbc7..8c1b78bf2 100644
--- a/app/components/edit-ssl-termination/template.hbs
+++ b/app/components/edit-ssl-termination/template.hbs
@@ -1,10 +1,4 @@
 {{#if hasSslListeners}}
-  <div class="row form-group">
-    <div class="col-sm-12 col-md-offset-2 col-md-8">
-      <p class="help-block">SSL Termination applies only to listeners with the <code>https</code> or <code>ssl</code> protocol selected.  Additional Certificates will be used by clients that support <a href="https://en.wikipedia.org/wiki/Server_Name_Indication" target="_blank">SNI</a>.  Clients that do not support SNI will always use the main Certificate.</p>
-    </div>
-  </div>
-
   <div class="row form-group">
     <div class="col-sm-12 col-md-2 form-label">
       <label class="form-control-static">Certificate*</label>
@@ -63,6 +57,12 @@
       </table>
     </div>
   </div>
+
+  <div class="row form-group">
+    <div class="col-sm-12 col-md-offset-2 col-md-8">
+      <p class="help-block">Note: Some older SSL/TLS clients do not support <a href="https://en.wikipedia.org/wiki/Server_Name_Indication" target="_blank">Server Name Indication (SNI)</a>; these clients will always be offered the main Certificate  Modern clients will be offered an appropriate certificate from the Alternate Certificates list if a match is found.</p>
+    </div>
+  </div>
 {{else}}
   <div class="text-muted text-center">
     There are no SSL listening ports configured.
diff --git a/package.json b/package.json
index 19c0e7526..a4bd19b1e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "private": true,
   "directories": {
     "doc": "doc",