diff --git a/server.py b/server.py
index 508d559..37b582d 100644
--- a/server.py
+++ b/server.py
@@ -106,7 +106,7 @@ def catch_all(path: str):
 #region API routes
 @app.route("/api/v1/ssl/<domain>")
 def api_ssl(domain: str):
-    regexmatch = re.match(r"^([a-z0-9]+(-[a-z0-9]+)*\.)*([a-z0-9]+(-[a-z0-9]+)*)$", domain)
+    regexmatch = re.match(r"^([a-z0-9]+(-[a-z0-9]+)*\.)*([a-z0-9]+([-a-z0-9])*)$", domain)
     if not regexmatch:
         return api_error("Please provide a valid domain to check")
     result = tools.check_ssl(domain)
diff --git a/templates/assets/js/ssl.js b/templates/assets/js/ssl.js
index a52c1a7..e570704 100644
--- a/templates/assets/js/ssl.js
+++ b/templates/assets/js/ssl.js
@@ -12,7 +12,7 @@ document.getElementById("domain").addEventListener("keyup", function (event) {
 
 function getSSL() {
     // Get the input value
-    const domain = document.getElementById("domain").value;
+    const domain = document.getElementById("domain").value.trim().toLowerCase();
     // Set the domain parameter
     const params = new URLSearchParams();
     params.append("domain", domain);