diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go
index 2034b0ff347..bfa5ebc639a 100644
--- a/pkg/services/sqlstore/user.go
+++ b/pkg/services/sqlstore/user.go
@@ -139,7 +139,7 @@ func GetUserByLogin(query *m.GetUserByLoginQuery) error {
 	if strings.Contains(query.LoginOrEmail, "@") {
 		user = &m.User{Email: query.LoginOrEmail}
 	} else {
-		user = &m.User{Login: strings.ToLower(query.LoginOrEmail)}
+		user = &m.User{Login: query.LoginOrEmail}
 	}
 
 	has, err := x.Get(user)
diff --git a/src/css/less/validation.less b/src/css/less/validation.less
index a0568bfc96a..fdb398f2245 100644
--- a/src/css/less/validation.less
+++ b/src/css/less/validation.less
@@ -1,3 +1,3 @@
-input[type=text].ng-invalid {
+input[type=text].ng-dirty.ng-invalid {
   box-shadow: inset 0 0px 7px @red;
 }