diff --git a/clientapi/auth/login_publickey_ethereum.go b/clientapi/auth/login_publickey_ethereum.go
index ff8311844..604148fa7 100644
--- a/clientapi/auth/login_publickey_ethereum.go
+++ b/clientapi/auth/login_publickey_ethereum.go
@@ -155,7 +155,7 @@ func (pk LoginPublicKeyEthereum) ValidateLoginResponse() (bool, *jsonerror.Matri
 
 func (pk LoginPublicKeyEthereum) CreateLogin() *Login {
 	identifier := LoginIdentifier{
-		Type: "m.id.user",
+		Type: "m.id.publickey",
 		User: pk.Address,
 	}
 	login := Login{
diff --git a/clientapi/auth/user_interactive.go b/clientapi/auth/user_interactive.go
index 1e234fefb..18b7bff6b 100644
--- a/clientapi/auth/user_interactive.go
+++ b/clientapi/auth/user_interactive.go
@@ -74,7 +74,7 @@ type Login struct {
 
 // Username returns the user localpart/user_id in this request, if it exists.
 func (r *Login) Username() string {
-	if r.Identifier.Type == "m.id.user" {
+	if r.Identifier.Type == "m.id.user" || r.Identifier.Type == "m.id.publickey" {
 		return r.Identifier.User
 	}
 	// deprecated but without it Element iOS won't log in