diff --git a/pkg/service/v0/accounts.go b/pkg/service/v0/accounts.go
index 73269b58db..6c9c8bafe3 100644
--- a/pkg/service/v0/accounts.go
+++ b/pkg/service/v0/accounts.go
@@ -158,7 +158,7 @@ func (s Service) ListAccounts(ctx context.Context, in *proto.ListAccountsRequest
 	// check if this looks like an auth request
 	match := authQuery.FindStringSubmatch(in.Query)
 	if len(match) == 3 {
-		in.Query = fmt.Sprintf("preferred_name eq '%s'", match[1]) // todo fetch email? make query configurable
+		in.Query = fmt.Sprintf("on_premises_sam_account_name eq '%s'", match[1]) // todo fetch email? make query configurable
 		password = match[2]
 		if password == "" {
 			return merrors.Unauthorized(s.id, "password must not be empty")
@@ -354,6 +354,7 @@ func (s Service) UpdateAccount(c context.Context, in *proto.UpdateAccountRequest
 	// deleteDateTime read only
 
 	out.OnPremisesSyncEnabled = in.Account.OnPremisesSyncEnabled
+	out.OnPremisesSamAccountName = in.Account.OnPremisesSamAccountName
 	// ... TODO on prem for sync
 
 	if out.ExternalUserState != in.Account.ExternalUserState {
@@ -400,7 +401,7 @@ func (s Service) DeleteAccount(c context.Context, in *proto.DeleteAccountRequest
 			AccountId: id,
 		}, a.MemberOf[i])
 		if err != nil {
-			s.log.Error().Err(err).Str("accountid", id).Str("groupid", a.MemberOf[i].Id).Msg("could not remove group membership")
+			s.log.Error().Err(err).Str("accountid", id).Str("groupid", a.MemberOf[i].Id).Msg("could not remove group member, skipping")
 		}
 	}
 
diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go
index acb661d80a..40904a7a8f 100644
--- a/pkg/service/v0/service.go
+++ b/pkg/service/v0/service.go
@@ -36,12 +36,13 @@ func New(opts ...Option) (s *Service, err error) {
 				// create default accounts
 				accounts := []proto.Account{
 					{
-						Id:            "4c510ada-c86b-4815-8820-42cdf82c3d51",
-						PreferredName: "einstein",
-						Mail:          "einstein@example.org",
-						DisplayName:   "Albert Einstein",
-						UidNumber:     20000,
-						GidNumber:     30000,
+						Id:                       "4c510ada-c86b-4815-8820-42cdf82c3d51",
+						PreferredName:            "einstein",
+						OnPremisesSamAccountName: "einstein",
+						Mail:                     "einstein@example.org",
+						DisplayName:              "Albert Einstein",
+						UidNumber:                20000,
+						GidNumber:                30000,
 						PasswordProfile: &proto.PasswordProfile{
 							Password: "$6$rounds=35210$sa1u5Pmfo4cr23Vw$RJNGElaDB1D3xorWkfTEGm2Ko.o2QL3E0cimKx23MNxVWVFSkUUeRoC7FqC4RzYDNQBD6cKzovTEaDD.8TDkD.",
 						},
@@ -54,12 +55,13 @@ func New(opts ...Option) (s *Service, err error) {
 						},
 					},
 					{
-						Id:            "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-						PreferredName: "marie",
-						Mail:          "marie@example.org",
-						DisplayName:   "Marie Curie",
-						UidNumber:     20001,
-						GidNumber:     30000,
+						Id:                       "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
+						PreferredName:            "marie",
+						OnPremisesSamAccountName: "marie",
+						Mail:                     "marie@example.org",
+						DisplayName:              "Marie Curie",
+						UidNumber:                20001,
+						GidNumber:                30000,
 						PasswordProfile: &proto.PasswordProfile{
 							Password: "$6$rounds=81434$sa1u5Pmfo4cr23Vw$W78cyL884GmuvDpxYPvSRBVzEj02T5QhTTcI8Dv4IKvMooDFGv4bwaWMkH9HfJ0wgpEBW7Lp.4Cad0xE/MYSg1",
 						},
@@ -72,12 +74,13 @@ func New(opts ...Option) (s *Service, err error) {
 						},
 					},
 					{
-						Id:            "932b4540-8d16-481e-8ef4-588e4b6b151c",
-						PreferredName: "richard",
-						Mail:          "richard@example.org",
-						DisplayName:   "Richard Feynman",
-						UidNumber:     20002,
-						GidNumber:     30000,
+						Id:                       "932b4540-8d16-481e-8ef4-588e4b6b151c",
+						PreferredName:            "richard",
+						OnPremisesSamAccountName: "richard",
+						Mail:                     "richard@example.org",
+						DisplayName:              "Richard Feynman",
+						UidNumber:                20002,
+						GidNumber:                30000,
 						PasswordProfile: &proto.PasswordProfile{
 							Password: "$6$rounds=5524$sa1u5Pmfo4cr23Vw$58bQVL/JeUlwM0RY21YKAFMvKvwKLLysGllYXox.vwKT5dHMwdzJjCxwTDMnB2o2pwexC8o/iOXyP2zrhALS40",
 						},
@@ -91,12 +94,13 @@ func New(opts ...Option) (s *Service, err error) {
 					},
 					// technical users for kopano and reva
 					{
-						Id:            "820ba2a1-3f54-4538-80a4-2d73007e30bf",
-						PreferredName: "konnectd",
-						Mail:          "idp@example.org",
-						DisplayName:   "Kopano Konnectd",
-						UidNumber:     10000,
-						GidNumber:     15000,
+						Id:                       "820ba2a1-3f54-4538-80a4-2d73007e30bf",
+						PreferredName:            "konnectd",
+						OnPremisesSamAccountName: "konnectd",
+						Mail:                     "idp@example.org",
+						DisplayName:              "Kopano Konnectd",
+						UidNumber:                10000,
+						GidNumber:                15000,
 						PasswordProfile: &proto.PasswordProfile{
 							Password: "$6$rounds=9746$sa1u5Pmfo4cr23Vw$2hnwpkTvUkWX0v6mh8Aw1pbzEXa9EUJzmrey4g2W/8arwWCwhteqU//3aWnA3S0d5T21fOKYteoqlsN1IbTcN.",
 						},
@@ -106,12 +110,13 @@ func New(opts ...Option) (s *Service, err error) {
 						},
 					},
 					{
-						Id:            "bc596f3c-c955-4328-80a0-60d018b4ad57",
-						PreferredName: "reva",
-						Mail:          "storage@example.org",
-						DisplayName:   "Reva Inter Operability Platform",
-						UidNumber:     10001,
-						GidNumber:     15000,
+						Id:                       "bc596f3c-c955-4328-80a0-60d018b4ad57",
+						PreferredName:            "reva",
+						OnPremisesSamAccountName: "reva",
+						Mail:                     "storage@example.org",
+						DisplayName:              "Reva Inter Operability Platform",
+						UidNumber:                10001,
+						GidNumber:                15000,
 						PasswordProfile: &proto.PasswordProfile{
 							Password: "$6$rounds=91087$sa1u5Pmfo4cr23Vw$wPC3BbMTbP/ytlo0p.f99zJifyO70AUCdKIK9hkhwutBKGCirLmZs/MsWAG6xHjVvmnmHN5NoON7FUGv5pPaN.",
 						},