diff --git a/pkg/service/v0/accounts.go b/pkg/service/v0/accounts.go
index 6e368ce9e..1afedabbe 100644
--- a/pkg/service/v0/accounts.go
+++ b/pkg/service/v0/accounts.go
@@ -4,15 +4,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	fieldmask_utils "github.com/mennanov/fieldmask-utils"
-	"github.com/rs/zerolog"
-	"google.golang.org/genproto/protobuf/field_mask"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"regexp"
 	"time"
 
+	fieldmask_utils "github.com/mennanov/fieldmask-utils"
+	"github.com/rs/zerolog"
+	"google.golang.org/genproto/protobuf/field_mask"
+
 	"github.com/CiscoM31/godata"
 	"github.com/blevesearch/bleve"
 	"github.com/gofrs/uuid"
@@ -311,6 +312,14 @@ func (s Service) CreateAccount(c context.Context, in *proto.CreateAccountRequest
 		return merrors.InternalServerError(s.id, "could not index new account: %v", err.Error())
 	}
 
+	s.log.Debug().Interface("account", acc).Msg("account after indexing")
+
+	if acc.PasswordProfile != nil {
+		acc.PasswordProfile.Password = ""
+	}
+
+	*out = *acc
+
 	return
 }