diff --git a/login.php b/login.php
index 2b0bb0d4..4d83ae0d 100644
--- a/login.php
+++ b/login.php
@@ -38,7 +38,7 @@ if($CONF['configured'] !== true) {
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
     $lang = safepost('lang');
-    $fUsername = safepost('fUsername');
+    $fUsername = trim(safepost('fUsername'));
     $fPassword = safepost('fPassword');
 
     if ( $lang != check_language(0) ) { # only set cookie if language selection was changed
diff --git a/users/login.php b/users/login.php
index 6ed99a3e..e697c95f 100644
--- a/users/login.php
+++ b/users/login.php
@@ -34,7 +34,7 @@ require_once("../common.php");
 if ($_SERVER['REQUEST_METHOD'] == "POST")
 {
    $lang = safepost('lang');
-   $fUsername = safepost('fUsername');
+   $fUsername = trim(safepost('fUsername'));
    $fPassword = safepost('fPassword');
 
    if ( $lang != check_language(0) ) { # only set cookie if language selection was changed