diff --git a/ocs/pkg/service/v0/service.go b/ocs/pkg/service/v0/service.go
index 9aa53aecaa..8a435611fb 100644
--- a/ocs/pkg/service/v0/service.go
+++ b/ocs/pkg/service/v0/service.go
@@ -157,7 +157,7 @@ func (o Ocs) getAccountService() accounts.AccountsService {
 }
 
 func (o Ocs) getCS3Backend() backend.UserBackend {
-	revaClient, err := cs3.GetGatewayServiceClient(o.config.RevaAddress)
+	revaClient, _ := cs3.GetGatewayServiceClient(o.config.RevaAddress)
 	return backend.NewCS3UserBackend(revaClient, nil, revaClient, o.logger)
 }
 
diff --git a/ocs/pkg/service/v0/users.go b/ocs/pkg/service/v0/users.go
index 52066ef7a4..ac25d0541d 100644
--- a/ocs/pkg/service/v0/users.go
+++ b/ocs/pkg/service/v0/users.go
@@ -262,7 +262,7 @@ func (o Ocs) EditUser(w http.ResponseWriter, r *http.Request) {
 	var err error
 	switch o.config.AccountBackend {
 	case "accounts":
-		account, err := o.fetchAccountByUsername(r.Context(), userid)
+		account, err = o.fetchAccountByUsername(r.Context(), userid)
 	case "cs3":
 		o.logger.Fatal().Msg("cs3 backend doesn't support editing users")
 	default:
@@ -340,7 +340,7 @@ func (o Ocs) DeleteUser(w http.ResponseWriter, r *http.Request) {
 	var err error
 	switch o.config.AccountBackend {
 	case "accounts":
-		account, err := o.fetchAccountByUsername(r.Context(), userid)
+		account, err = o.fetchAccountByUsername(r.Context(), userid)
 	case "cs3":
 		o.logger.Fatal().Msg("cs3 backend doesn't support deleting users")
 	default:
@@ -386,7 +386,7 @@ func (o Ocs) EnableUser(w http.ResponseWriter, r *http.Request) {
 	var err error
 	switch o.config.AccountBackend {
 	case "accounts":
-		account, err := o.fetchAccountByUsername(r.Context(), userid)
+		account, err = o.fetchAccountByUsername(r.Context(), userid)
 	case "cs3":
 		o.logger.Fatal().Msg("cs3 backend doesn't support enabling users")
 	default:
@@ -437,7 +437,7 @@ func (o Ocs) DisableUser(w http.ResponseWriter, r *http.Request) {
 	var err error
 	switch o.config.AccountBackend {
 	case "accounts":
-		account, err := o.fetchAccountByUsername(r.Context(), userid)
+		account, err = o.fetchAccountByUsername(r.Context(), userid)
 	case "cs3":
 		o.logger.Fatal().Msg("cs3 backend doesn't support disabling users")
 	default: