diff --git a/src/sbbs3/ssl.c b/src/sbbs3/ssl.c
index 2d4fb67c8d8603be8a3e41dcaad02a64001668b3..81fc57396f1be449c6aab9085f48c4824762662f 100644
--- a/src/sbbs3/ssl.c
+++ b/src/sbbs3/ssl.c
@@ -41,6 +41,7 @@ static int DLLCALL crypt_ll(int error)
 	switch(error) {
 		case CRYPT_ERROR_INCOMPLETE:
 		case CRYPT_ERROR_NOSECURE:
+		case CRYPT_ERROR_BADDATA:
 			return LOG_WARNING;
 		case CRYPT_ERROR_INTERNAL:
 			return LOG_NOTICE;
@@ -184,7 +185,7 @@ bool DLLCALL get_crypt_error_string(int status, CRYPT_HANDLE sess, char **estr,
 					emsg = "Not enough data available";
 					break;
 				case CRYPT_ERROR_BADDATA:
-					emsg = "Bad/unrecognised data format";
+					emsg = "Bad/unrecognized data format";
 					break;
 				case CRYPT_ERROR_SIGNATURE:
 					emsg = "Signature/integrity check failed";
@@ -315,7 +316,7 @@ CRYPT_CONTEXT DLLCALL get_ssl_cert(scfg_t *cfg, char **estr, int *level)
 			goto failure_return_3;
 		if(!DO("setting country name", ssl_cert, cryptSetAttributeString(ssl_cert, CRYPT_CERTINFO_COUNTRYNAME, "ZZ", 2)))
 			goto failure_return_3;
-		if(!DO("setting orginization name", ssl_cert, cryptSetAttributeString(ssl_cert, CRYPT_CERTINFO_ORGANIZATIONNAME, cfg->sys_name, strlen(cfg->sys_name))))
+		if(!DO("setting organization name", ssl_cert, cryptSetAttributeString(ssl_cert, CRYPT_CERTINFO_ORGANIZATIONNAME, cfg->sys_name, strlen(cfg->sys_name))))
 			goto failure_return_3;
 		if(!DO("setting DNS name", ssl_cert, cryptSetAttributeString(ssl_cert, CRYPT_CERTINFO_DNSNAME, cfg->sys_inetaddr, strlen(cfg->sys_inetaddr))))
 			goto failure_return_3;