diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go
index 42cd91a3ad1..2529fef67a9 100644
--- a/pkg/middleware/auth_proxy.go
+++ b/pkg/middleware/auth_proxy.go
@@ -60,8 +60,10 @@ func getCreateUserCommandForProxyAuth(headerVal string) *m.CreateUserCommand {
 	cmd := m.CreateUserCommand{}
 	if setting.AuthProxyHeaderProperty == "username" {
 		cmd.Login = headerVal
+		cmd.Email = headerVal
 	} else if setting.AuthProxyHeaderProperty == "email" {
 		cmd.Email = headerVal
+		cmd.Login = headerVal
 	} else {
 		panic("Auth proxy header property invalid")
 	}