diff --git a/op/op.Login.php b/op/op.Login.php
index 135c5aefc..63d05d9c8 100644
--- a/op/op.Login.php
+++ b/op/op.Login.php
@@ -50,8 +50,8 @@ if (isset($_REQUEST["sesstheme"]) && strlen($_REQUEST["sesstheme"])>0 && is_nume
 }
 
 if (isset($_REQUEST["login"])) {
-	$login = $_REQUEST["login"];
-	$login = str_replace("*", "", $login);
+	$login = trim($_REQUEST["login"]);
+	$login = str_replace(["*", "\0"], "", $login);
 }
 
 if (!isset($login) || strlen($login)==0) {