diff --git a/api/db/member.go b/api/db/member.go
index 40f4ba172c4183ab6896ad2c6dd4d4d5472eea5a..78e6a046b775cbdf6205115b995aa90bc7c68a87 100644
--- a/api/db/member.go
+++ b/api/db/member.go
@@ -125,10 +125,15 @@ func (d DB) UpdateMember(num int, member MemberReq, checkPass bool) (Member, err
 }
 
 func (d DB) Login(login, password string) (member Member, err error) {
-	err = d.db.Where("login = ?", cleanLogin(login)).
+	cleanedLogin := cleanLogin(login)
+	err = d.db.Where("email = ?", cleanedLogin).
 		First(&member).Error
 	if err != nil {
-		return
+		err = d.db.Where("login = ?", cleanedLogin).
+			First(&member).Error
+		if err != nil {
+			return
+		}
 	}
 
 	if !passwordValid(password, member) {
diff --git a/src/SignIn.js b/src/SignIn.js
index c12a934f3040a4f61fb38b1d020b5279a29703cc..89087e1d09d9dee294058d24dc4e60263e32ebf3 100644
--- a/src/SignIn.js
+++ b/src/SignIn.js
@@ -34,9 +34,9 @@ function SignIn(props) {
           onError={onError}
         >
           <Form.Group>
-            <Form.Label>Nombre de acceso</Form.Label>
+            <Form.Label>Nombre de acceso o email</Form.Label>
             <Form.Control
-              placeholder="Nombre"
+              placeholder="Nombre o email"
               value={login}
               onChange={(e) => setLogin(e.target.value)}
               isInvalid={badAuth}