diff --git a/src/sunstone/public/app/login.js b/src/sunstone/public/app/login.js
index 2f44379deb..7104778500 100644
--- a/src/sunstone/public/app/login.js
+++ b/src/sunstone/public/app/login.js
@@ -109,8 +109,8 @@ define(function(require) {
   }
 
   function authenticate(publicKeyCredential) {
-    var username = $("#username").val();
-    var password = $("#password").val();
+    var username = $.trim($("#username").val());
+    var password = $.trim($("#password").val());
     var remember = $("#check_remember").is(":checked");
     var two_factor_auth_token;
     var error_callback;