diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html
index 72484d83..77a04ef9 100644
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -344,23 +344,25 @@ scheduled_jobs = [j.id for j in plexpy.SCHED.get_jobs()]
                                 </label>
                                 <p class="help-block">Check to have PlexPy create a self-signed SSL certificate. Uncheck if you want to use your own certificate.</p>
                             </div>
-                            <div class="form-group">
-                                <label for="https_domain">HTTPS Domains</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <input type="text" class="form-control http-settings" id="https_domain" name="https_domain" value="${config['https_domain']}">
+                            <div id="https_options_self-signed">
+                                <div class="form-group">
+                                    <label for="https_domain">HTTPS Domains</label>
+                                    <div class="row">
+                                        <div class="col-md-6">
+                                            <input type="text" class="form-control http-settings" id="https_domain" name="https_domain" value="${config['https_domain']}">
+                                        </div>
                                     </div>
+                                    <p class="help-block">The domain names used to access PlexPy, separated by commas (,).</p>
                                 </div>
-                                <p class="help-block">The domain names used to access PlexPy, separated by commas (,).</p>
-                            </div>
-                            <div class="form-group">
-                                <label for="https_ip">HTTPS IPs</label>
-                                <div class="row">
-                                    <div class="col-md-6">
-                                        <input type="text" class="form-control http-settings" id="https_ip" name="https_ip" value="${config['https_ip']}">
+                                <div class="form-group">
+                                    <label for="https_ip">HTTPS IPs</label>
+                                    <div class="row">
+                                        <div class="col-md-6">
+                                            <input type="text" class="form-control http-settings" id="https_ip" name="https_ip" value="${config['https_ip']}">
+                                        </div>
                                     </div>
+                                    <p class="help-block">The IP addresses used to access PlexPy, separated by commas (,).</p>
                                 </div>
-                                <p class="help-block">The IP addresses used to access PlexPy, separated by commas (,).</p>
                             </div>
                             <div class="form-group">
                                 <label for="https_cert">HTTPS Cert</label>
@@ -1732,6 +1734,20 @@ $(document).ready(function() {
         }
     });
 
+    if ($("#https_create_cert").is(":checked")) {
+        $("#https_options_self-signed").show();
+    } else {
+        $("#https_options_self-signed").hide();
+    }
+
+    $("#https_create_cert").click(function(){
+        if ($("#https_create_cert").is(":checked")) {
+            $("#https_options_self-signed").slideDown();
+        } else {
+            $("#https_options_self-signed").slideUp();
+        }
+    });
+
     $( ".http-settings" ).change(function() {
         httpChanged = true;
     });
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index da788a15..d7f4d5e2 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1273,8 +1273,9 @@ class WebInterface(object):
             server_changed = True
 
         # If we change the HTTPS setting, make sure we generate a new certificate.
-        if kwargs['https_create_cert']:
-            if 'https_domain' in kwargs and (kwargs['https_domain'] != plexpy.CONFIG.HTTPS_DOMAIN) or \
+        if 'https_create_cert' in kwargs and kwargs['https_create_cert']:
+            if 'https_create_cert' in kwargs and (kwargs['https_create_cert'] != plexpy.CONFIG.HTTPS_CREATE_CERT) or \
+                'https_domain' in kwargs and (kwargs['https_domain'] != plexpy.CONFIG.HTTPS_DOMAIN) or \
                 'https_ip' in kwargs and (kwargs['https_ip'] != plexpy.CONFIG.HTTPS_IP) or \
                 'https_cert' in kwargs and (kwargs['https_cert'] != plexpy.CONFIG.HTTPS_CERT) or \
                 'https_key' in kwargs and (kwargs['https_key'] != plexpy.CONFIG.HTTPS_KEY):