diff --git a/interface/src/forms/APSettingsForm.js b/interface/src/forms/APSettingsForm.js
index 3447616..582241d 100644
--- a/interface/src/forms/APSettingsForm.js
+++ b/interface/src/forms/APSettingsForm.js
@@ -65,7 +65,7 @@ class APSettingsForm extends React.Component {
             isAPEnabled(apSettings.provision_mode) &&
             <Fragment>
               <TextValidator
-                validators={['required', 'matchRegexp:^.{0,32}$']}
+                validators={['required', 'matchRegexp:^.{1,32}$']}
                 errorMessages={['Access Point SSID is required', 'Access Point SSID must be 32 characeters or less']}
                 name="ssid"
                 label="Access Point SSID"
@@ -75,7 +75,7 @@ class APSettingsForm extends React.Component {
                 margin="normal"
               />
               <PasswordValidator
-                    validators={['required', 'matchRegexp:^.{0,64}$']}
+                    validators={['required', 'matchRegexp:^.{1,64}$']}
                     errorMessages={['Access Point Password is required', 'Access Point Password must be 64 characters or less']}
                     name="password"
                     label="Access Point Password"
diff --git a/interface/src/forms/OTASettingsForm.js b/interface/src/forms/OTASettingsForm.js
index 5681f64..31bb411 100644
--- a/interface/src/forms/OTASettingsForm.js
+++ b/interface/src/forms/OTASettingsForm.js
@@ -85,7 +85,7 @@ class OTASettingsForm extends React.Component {
              />
 
              <PasswordValidator
-                   validators={['required', 'matchRegexp:^.{0,64}$']}
+                   validators={['required', 'matchRegexp:^.{1,64}$']}
                    errorMessages={['OTA Password is required', 'OTA Point Password must be 64 characters or less']}
                    name="password"
                    label="Password"
diff --git a/interface/src/forms/SecuritySettingsForm.js b/interface/src/forms/SecuritySettingsForm.js
index 387cb41..00a339c 100644
--- a/interface/src/forms/SecuritySettingsForm.js
+++ b/interface/src/forms/SecuritySettingsForm.js
@@ -49,7 +49,7 @@ class SecuritySettingsForm extends React.Component {
         securitySettings ?
           <ValidatorForm onSubmit={this.onSubmit} ref="SecuritySettingsForm">
             <PasswordValidator
-              validators={['required', 'matchRegexp:^.{0,64}$']}
+              validators={['required', 'matchRegexp:^.{1,64}$']}
               errorMessages={['JWT Secret Required', 'JWT Secret must be 64 characters or less']}
               name="jwt_secret"
               label="JWT Secret"
diff --git a/interface/src/forms/UserForm.js b/interface/src/forms/UserForm.js
index a75fe62..364feb3 100644
--- a/interface/src/forms/UserForm.js
+++ b/interface/src/forms/UserForm.js
@@ -48,7 +48,7 @@ class UserForm extends React.Component {
           <DialogContent dividers={true}>
             <TextValidator
               validators={creating ? ['required', 'uniqueUsername', 'matchRegexp:^[a-zA-Z0-9_\\.]{1,24}$'] : []}
-              errorMessages={creating ? ['Username is required', "Username already exists", "Must be 1-24 characters: alpha numberic, '_' or '.'"] : []}
+              errorMessages={creating ? ['Username is required', "Username already exists", "Must be 1-24 characters: alpha numeric, '_' or '.'"] : []}
               name="username"
               label="Username"
               className={classes.textField}
@@ -58,7 +58,7 @@ class UserForm extends React.Component {
               margin="normal"
             />
             <PasswordValidator
-              validators={['required', 'matchRegexp:^.{0,64}$']}
+              validators={['required', 'matchRegexp:^.{1,64}$']}
               errorMessages={['Password is required', 'Password must be 64 characters or less']}
               name="password"
               label="Password"
diff --git a/interface/src/forms/WiFiSettingsForm.js b/interface/src/forms/WiFiSettingsForm.js
index 33e1ab9..bd43bec 100644
--- a/interface/src/forms/WiFiSettingsForm.js
+++ b/interface/src/forms/WiFiSettingsForm.js
@@ -1,4 +1,4 @@
-import React, {Fragment} from 'react';
+import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 
 import { withStyles } from '@material-ui/core/styles';
@@ -67,7 +67,7 @@ class WiFiSettingsForm extends React.Component {
           </ListItemAvatar>
           <ListItemText
             primary={selectedNetwork.ssid}
-            secondary={"Security: "+ networkSecurityMode(selectedNetwork) + ", Ch: " + selectedNetwork.channel}
+            secondary={"Security: " + networkSecurityMode(selectedNetwork) + ", Ch: " + selectedNetwork.channel}
           />
           <ListItemSecondaryAction>
             <IconButton aria-label="Manual Config" onClick={deselectNetwork}>
@@ -84,57 +84,57 @@ class WiFiSettingsForm extends React.Component {
     return (
       <div>
         {
-         !wifiSettingsFetched ?
+          !wifiSettingsFetched ?
 
-         <div className={classes.loadingSettings}>
-           <LinearProgress className={classes.loadingSettingsDetails}/>
-           <Typography variant="h4" className={classes.loadingSettingsDetails}>
-             Loading...
-           </Typography>
-         </div>
+            <div className={classes.loadingSettings}>
+              <LinearProgress className={classes.loadingSettingsDetails} />
+              <Typography variant="h4" className={classes.loadingSettingsDetails}>
+                Loading...
+              </Typography>
+            </div>
 
-         : wifiSettings ?
+            : wifiSettings ?
 
-      	 <ValidatorForm onSubmit={onSubmit} ref="WiFiSettingsForm">
-           {
-             selectedNetwork ? this.renderSelectedNetwork() :
-              <TextValidator
-                validators={['required', 'matchRegexp:^.{0,32}$']}
-                errorMessages={['SSID is required', 'SSID must be 32 characeters or less']}
-                name="ssid"
-                label="SSID"
-                className={classes.textField}
-                value={wifiSettings.ssid}
-                onChange={handleValueChange('ssid')}
-                margin="normal"
-              />
-            }
-              {
-                !isNetworkOpen(selectedNetwork) &&
-         		<PasswordValidator
-                  validators={['matchRegexp:^.{0,64}$']}
-                  errorMessages={['Password must be 64 characters or less']}
-                  name="password"
-                  label="Password"
-                  className={classes.textField}
-                  value={wifiSettings.password}
-                  onChange={handleValueChange('password')}
-                  margin="normal"
-                />
-              }
-
-              <TextValidator
-                    validators={['required', 'isHostname']}
-                    errorMessages={['Hostname is required', "Not a valid hostname"]}
-                    name="hostname"
-                    label="Hostname"
+              <ValidatorForm onSubmit={onSubmit} ref="WiFiSettingsForm">
+                {
+                  selectedNetwork ? this.renderSelectedNetwork() :
+                    <TextValidator
+                      validators={['required', 'matchRegexp:^.{1,32}$']}
+                      errorMessages={['SSID is required', 'SSID must be 32 characeters or less']}
+                      name="ssid"
+                      label="SSID"
+                      className={classes.textField}
+                      value={wifiSettings.ssid}
+                      onChange={handleValueChange('ssid')}
+                      margin="normal"
+                    />
+                }
+                {
+                  !isNetworkOpen(selectedNetwork) &&
+                  <PasswordValidator
+                    validators={['matchRegexp:^.{0,64}$']}
+                    errorMessages={['Password must be 64 characters or less']}
+                    name="password"
+                    label="Password"
                     className={classes.textField}
-                    value={wifiSettings.hostname}
-                    onChange={handleValueChange('hostname')}
+                    value={wifiSettings.password}
+                    onChange={handleValueChange('password')}
                     margin="normal"
                   />
+                }
 
-        		<FormControlLabel className={classes.checkboxControl}
+                <TextValidator
+                  validators={['required', 'isHostname']}
+                  errorMessages={['Hostname is required', "Not a valid hostname"]}
+                  name="hostname"
+                  label="Hostname"
+                  className={classes.textField}
+                  value={wifiSettings.hostname}
+                  onChange={handleValueChange('hostname')}
+                  margin="normal"
+                />
+
+                <FormControlLabel className={classes.checkboxControl}
                   control={
                     <Checkbox
                       value="static_ip_config"
@@ -145,82 +145,82 @@ class WiFiSettingsForm extends React.Component {
                   label="Static IP Config?"
                 />
 
-        		{
-          		wifiSettings.static_ip_config &&
-          		<Fragment>
-          			<TextValidator
-          			  validators={['required', 'isIP']}
-          			  errorMessages={['Local IP is required', 'Must be an IP address']}
-          			  name="local_ip"
-          			  label="Local IP"
-          			  className={classes.textField}
-          			  value={wifiSettings.local_ip}
-          			  onChange={handleValueChange('local_ip')}
-          			  margin="normal"
-          			/>
-                <TextValidator
-                  validators={['required', 'isIP']}
-                  errorMessages={['Gateway IP is required', 'Must be an IP address']}
-                  name="gateway_ip"
-                  label="Gateway"
-                  className={classes.textField}
-                  value={wifiSettings.gateway_ip}
-                  onChange={handleValueChange('gateway_ip')}
-                  margin="normal"
-                />
-                <TextValidator
-          			  validators={['required', 'isIP']}
-          			  errorMessages={['Subnet mask is required', 'Must be an IP address']}
-          			  name="subnet_mask"
-          			  label="Subnet"
-          			  className={classes.textField}
-          			  value={wifiSettings.subnet_mask}
-          			  onChange={handleValueChange('subnet_mask')}
-                  margin="normal"
-          			/>
-                <TextValidator
-          			  validators={['isOptionalIP']}
-          			  errorMessages={['Must be an IP address']}
-          			  name="dns_ip_1"
-          			  label="DNS IP #1"
-          			  className={classes.textField}
-          			  value={wifiSettings.dns_ip_1}
-          			  onChange={handleValueChange('dns_ip_1')}
-                  margin="normal"
-          			/>
-                <TextValidator
-          			  validators={['isOptionalIP']}
-          			  errorMessages={['Must be an IP address']}
-          			  name="dns_ip_2"
-          			  label="DNS IP #2"
-          			  className={classes.textField}
-          			  value={wifiSettings.dns_ip_2}
-          			  onChange={handleValueChange('dns_ip_2')}
-                  margin="normal"
-          			/>
-          		</Fragment>
-      		  }
+                {
+                  wifiSettings.static_ip_config &&
+                  <Fragment>
+                    <TextValidator
+                      validators={['required', 'isIP']}
+                      errorMessages={['Local IP is required', 'Must be an IP address']}
+                      name="local_ip"
+                      label="Local IP"
+                      className={classes.textField}
+                      value={wifiSettings.local_ip}
+                      onChange={handleValueChange('local_ip')}
+                      margin="normal"
+                    />
+                    <TextValidator
+                      validators={['required', 'isIP']}
+                      errorMessages={['Gateway IP is required', 'Must be an IP address']}
+                      name="gateway_ip"
+                      label="Gateway"
+                      className={classes.textField}
+                      value={wifiSettings.gateway_ip}
+                      onChange={handleValueChange('gateway_ip')}
+                      margin="normal"
+                    />
+                    <TextValidator
+                      validators={['required', 'isIP']}
+                      errorMessages={['Subnet mask is required', 'Must be an IP address']}
+                      name="subnet_mask"
+                      label="Subnet"
+                      className={classes.textField}
+                      value={wifiSettings.subnet_mask}
+                      onChange={handleValueChange('subnet_mask')}
+                      margin="normal"
+                    />
+                    <TextValidator
+                      validators={['isOptionalIP']}
+                      errorMessages={['Must be an IP address']}
+                      name="dns_ip_1"
+                      label="DNS IP #1"
+                      className={classes.textField}
+                      value={wifiSettings.dns_ip_1}
+                      onChange={handleValueChange('dns_ip_1')}
+                      margin="normal"
+                    />
+                    <TextValidator
+                      validators={['isOptionalIP']}
+                      errorMessages={['Must be an IP address']}
+                      name="dns_ip_2"
+                      label="DNS IP #2"
+                      className={classes.textField}
+                      value={wifiSettings.dns_ip_2}
+                      onChange={handleValueChange('dns_ip_2')}
+                      margin="normal"
+                    />
+                  </Fragment>
+                }
 
-          <Button variant="contained" color="primary" className={classes.button} type="submit">
-            Save
+                <Button variant="contained" color="primary" className={classes.button} type="submit">
+                  Save
           </Button>
-          <Button variant="contained" color="secondary" className={classes.button} onClick={onReset}>
-      		  Reset
+                <Button variant="contained" color="secondary" className={classes.button} onClick={onReset}>
+                  Reset
       		</Button>
 
-        </ValidatorForm>
+              </ValidatorForm>
 
-        :
+              :
 
-        <div className={classes.loadingSettings}>
-          <Typography variant="h4" className={classes.loadingSettingsDetails}>
-            {errorMessage}
-          </Typography>
-          <Button variant="contained" color="secondary" className={classes.button} onClick={onReset}>
-      		  Reset
+              <div className={classes.loadingSettings}>
+                <Typography variant="h4" className={classes.loadingSettingsDetails}>
+                  {errorMessage}
+                </Typography>
+                <Button variant="contained" color="secondary" className={classes.button} onClick={onReset}>
+                  Reset
       		</Button>
-        </div>
-      }
+              </div>
+        }
       </div>
     );
   }
diff --git a/src/APSettingsService.cpp b/src/APSettingsService.cpp
index a5f966d..98ceb58 100644
--- a/src/APSettingsService.cpp
+++ b/src/APSettingsService.cpp
@@ -46,7 +46,7 @@ void APSettingsService::stopAP() {
     Serial.println("Stopping captive portal");
     _dnsServer->stop();
     delete _dnsServer;
-    _dnsServer = NULL;
+    _dnsServer = nullptr;
   }
   Serial.println("Stopping software access point");
   WiFi.softAPdisconnect(true);
diff --git a/src/ArduinoJsonJWT.cpp b/src/ArduinoJsonJWT.cpp
index 0c945dc..2a50d5d 100644
--- a/src/ArduinoJsonJWT.cpp
+++ b/src/ArduinoJsonJWT.cpp
@@ -69,14 +69,14 @@ void ArduinoJsonJWT::parseJWT(String jwt, JsonDocument &jsonDocument) {
     return;
   }
   // must have signature of correct length
-  int signatureDelimieterIndex = jwt.length() - JWT_SIG_SIZE - 1;
-  if (jwt.lastIndexOf('.') != signatureDelimieterIndex) {
+  int signatureDelimiterIndex = jwt.length() - JWT_SIG_SIZE - 1;
+  if (jwt.lastIndexOf('.') != signatureDelimiterIndex) {
     return;
   }
 
   // signature must be correct
-  String signature = jwt.substring(signatureDelimieterIndex + 1);
-  jwt = jwt.substring(0, signatureDelimieterIndex);
+  String signature = jwt.substring(signatureDelimiterIndex + 1);
+  jwt = jwt.substring(0, signatureDelimiterIndex);
   if (sign(jwt) != signature){
     return;
   }
@@ -115,7 +115,7 @@ String ArduinoJsonJWT::encode(const char *cstr, int inputLen) {
   String value = String(buffer);
 
   // remove padding and convert to URL safe form
-  while (value.charAt(value.length() - 1) == '='){
+  while (value.length() > 0 && value.charAt(value.length() - 1) == '='){
     value.remove(value.length() - 1);
   }
   value.replace('+', '-');
diff --git a/src/AsyncArduinoJson6.h b/src/AsyncArduinoJson6.h
index f075d46..b95ea6c 100644
--- a/src/AsyncArduinoJson6.h
+++ b/src/AsyncArduinoJson6.h
@@ -109,7 +109,7 @@ public:
   }
   virtual void handleRequest(AsyncWebServerRequest *request) override final {
     if(_onRequest) {
-      if (request->_tempObject != NULL) {
+      if (request->_tempObject != nullptr) {
         DynamicJsonDocument _jsonDocument(_maxContentLength);
         DeserializationError err = deserializeJson(_jsonDocument, (uint8_t*)(request->_tempObject));
         if (err == DeserializationError::Ok) {
@@ -127,10 +127,10 @@ public:
   virtual void handleBody(AsyncWebServerRequest *request, uint8_t *data, size_t len, size_t index, size_t total) override final {
     if (_onRequest) {
       _contentLength = total;
-      if (total > 0 && request->_tempObject == NULL && total < _maxContentLength) {
+      if (total > 0 && request->_tempObject == nullptr && total < _maxContentLength) {
         request->_tempObject = malloc(total);
       }
-      if (request->_tempObject != NULL) {
+      if (request->_tempObject != nullptr) {
         memcpy((uint8_t*)(request->_tempObject) + index, data, len);
       }
     }
diff --git a/src/AsyncJsonWebHandler.h b/src/AsyncJsonWebHandler.h
index 8489f76..dde3470 100644
--- a/src/AsyncJsonWebHandler.h
+++ b/src/AsyncJsonWebHandler.h
@@ -31,7 +31,7 @@ class AsyncJsonWebHandler: public AsyncWebHandler {
 
     AsyncJsonWebHandler() :      
       _method(HTTP_POST|HTTP_PUT|HTTP_PATCH),
-      _onRequest(NULL),
+      _onRequest(nullptr),
       _maxContentLength(ASYNC_JSON_REQUEST_DEFAULT_MAX_SIZE),
       _uri() {}
 
diff --git a/src/OTASettingsService.cpp b/src/OTASettingsService.cpp
index 2c9490a..f891448 100644
--- a/src/OTASettingsService.cpp
+++ b/src/OTASettingsService.cpp
@@ -40,7 +40,7 @@ void OTASettingsService::writeToJsonObject(JsonObject& root) {
 void OTASettingsService::configureArduinoOTA() {
   if (_arduinoOTA){
     delete _arduinoOTA;
-    _arduinoOTA = NULL;
+    _arduinoOTA = nullptr;
   }
   if (_enabled) {
     Serial.println("Starting OTA Update Service");
diff --git a/src/SecurityManager.h b/src/SecurityManager.h
index 0b35fb9..b8c514f 100644
--- a/src/SecurityManager.h
+++ b/src/SecurityManager.h
@@ -37,11 +37,9 @@ class Authentication {
     boolean _authenticated;
   public:
     Authentication(User& user): _user(new User(user)), _authenticated(true) {}
-    Authentication() : _user(NULL), _authenticated(false) {}  
+    Authentication() : _user(nullptr), _authenticated(false) {}  
     ~Authentication() {
-      if (_user != NULL){
-        delete(_user);
-      }      
+      delete(_user);   
     }
     User* getUser() {
       return _user;