diff --git a/OWNd/connection.py b/OWNd/connection.py
index 7716427..1fdff59 100644
--- a/OWNd/connection.py
+++ b/OWNd/connection.py
@@ -546,11 +546,11 @@ async def _negotiate_exchange(self) -> dict:
 
         if self._gateway.password is not None and not (
             isinstance(self._gateway.password, str)
-            and self._gateway.password.isascii()
-            and self._gateway.password.isdecimal()
+            and self._gateway.password.isalnum()
+            and len(self._gateway.password) <= 16
         ):
             self._logger.error(
-                "%s Invalid OpenWebNet password: expected decimal digits only.",
+                "%s Invalid OpenWebNet password: expected alphanumerics only.",
                 self._log_id,
             )
             return {"Success": False, "Message": "password_error"}