diff --git a/ocs/pkg/server/http/svc_test.go b/ocs/pkg/server/http/svc_test.go
index b12bcb9727..86ad18e784 100644
--- a/ocs/pkg/server/http/svc_test.go
+++ b/ocs/pkg/server/http/svc_test.go
@@ -312,8 +312,12 @@ func assertUserSame(t *testing.T, expected, actual User, quotaAvailable bool) {
 		assert.Equal(t, expected.Quota, actual.Quota, "Quota match for user %v", expected.Username)
 	}
 
-	assert.Equal(t, expected.UIDNumber, actual.UIDNumber, "UidNumber doesn't match for user %v", expected.Username)
-	assert.Equal(t, expected.GIDNumber, actual.GIDNumber, "GidNumber doesn't match for user %v", expected.Username)
+	if expected.UIDNumber != 0 {
+		assert.Equal(t, expected.UIDNumber, actual.UIDNumber, "UidNumber doesn't match for user %s", expected.Username)
+	}
+	if expected.GIDNumber != 0 {
+		assert.Equal(t, expected.GIDNumber, actual.GIDNumber, "GidNumber doesn't match for user %s", expected.Username)
+	}
 
 }
 
diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go
index c4a3a6021a..46a3bc2246 100644
--- a/ocs/pkg/service/v0/users.go
+++ b/ocs/pkg/service/v0/users.go
@@ -183,7 +183,7 @@ func (o Ocs) AddUser(w http.ResponseWriter, r *http.Request) {
 		LegacyDisplayName: account.DisplayName,
 		Email:             account.Mail,
 		UIDNumber:         account.UidNumber,
-		GIDNumber:         account.UidNumber,
+		GIDNumber:         account.GidNumber,
 		Enabled:           enabled,
 	}))
 }