diff --git a/static/js/views/settings.js b/static/js/views/settings.js
index 9c3bf7b13..854f0ec82 100644
--- a/static/js/views/settings.js
+++ b/static/js/views/settings.js
@@ -590,7 +590,7 @@ const SettingsScreen = {
   },
 
   validateWifi: function () {
-    const valid = this.elements.network.client.wifi.password.value.length >= 8;
+    const valid = (this.elements.network.client.wifi.password.value.length == 0 || this.elements.network.client.wifi.password.value.length >= 8);
 
     this.elements.network.client.wifi.connect.disabled = !valid;
   },
@@ -1162,7 +1162,7 @@ const SettingsScreen = {
     const components = new Map();
 
     // First, get the list of installed add-ons. Do this separately so that the
-    // add-ons can be displayed when no internet connection is present.
+    // add-ons can be displayed when no internet ion is present.
     this.fetchInstalledAddonList(true)
       .then(() => {
         const addonList = document.getElementById('installed-addons-list');
diff --git a/tools/make-self-signed-cert.sh b/tools/make-self-signed-cert.sh
index 603100eda..5e1a302f8 100755
--- a/tools/make-self-signed-cert.sh
+++ b/tools/make-self-signed-cert.sh
@@ -7,4 +7,4 @@ SSL_DIR="${WEBTHINGS_HOME}/ssl"
 [ ! -d "${SSL_DIR}" ] && mkdir -p "${SSL_DIR}"
 openssl genrsa -out "${SSL_DIR}/privatekey.pem" 2048
 openssl req -new -sha256 -key "${SSL_DIR}/privatekey.pem" -out "${SSL_DIR}/csr.pem" -subj '/CN=www.sgnihtbew.com/O=WebThings Gateway/C=US'
-openssl x509 -req -in "${SSL_DIR}/csr.pem" -signkey "${SSL_DIR}/privatekey.pem" -out "${SSL_DIR}/certificate.pem"
+openssl x509 -req -days 3650 -in "${SSL_DIR}/csr.pem" -signkey "${SSL_DIR}/privatekey.pem" -out "${SSL_DIR}/certificate.pem"