diff --git a/management/internals/modules/reverseproxy/manager/api.go b/management/internals/modules/reverseproxy/manager/api.go
index 20d5a0426..6ff669bbd 100644
--- a/management/internals/modules/reverseproxy/manager/api.go
+++ b/management/internals/modules/reverseproxy/manager/api.go
@@ -69,7 +69,7 @@ func (h *handler) createReverseProxy(w http.ResponseWriter, r *http.Request) {
 	}
 
 	reverseProxy := new(reverseproxy.ReverseProxy)
-	reverseProxy.FromAPIRequest(&req)
+	reverseProxy.FromAPIRequest(&req, userAuth.AccountId)
 
 	if err = reverseProxy.Validate(); err != nil {
 		util.WriteError(r.Context(), status.Errorf(status.InvalidArgument, "%s", err.Error()), w)
@@ -128,7 +128,7 @@ func (h *handler) updateReverseProxy(w http.ResponseWriter, r *http.Request) {
 
 	reverseProxy := new(reverseproxy.ReverseProxy)
 	reverseProxy.ID = reverseProxyID
-	reverseProxy.FromAPIRequest(&req)
+	reverseProxy.FromAPIRequest(&req, userAuth.AccountId)
 
 	if err = reverseProxy.Validate(); err != nil {
 		util.WriteError(r.Context(), status.Errorf(status.InvalidArgument, "%s", err.Error()), w)
diff --git a/management/internals/modules/reverseproxy/manager/manager.go b/management/internals/modules/reverseproxy/manager/manager.go
index 5b14210b1..5ed089c84 100644
--- a/management/internals/modules/reverseproxy/manager/manager.go
+++ b/management/internals/modules/reverseproxy/manager/manager.go
@@ -98,6 +98,7 @@ func (m *managerImpl) CreateReverseProxy(ctx context.Context, accountID, userID
 
 	m.accountManager.StoreEvent(ctx, userID, reverseProxy.ID, accountID, activity.ReverseProxyCreated, reverseProxy.EventMeta())
 
+	// TODO: refactor to avoid policy and group creation here
 	group := &types.Group{
 		ID:     xid.New().String(),
 		Name:   reverseProxy.Name,
@@ -128,7 +129,6 @@ func (m *managerImpl) CreateReverseProxy(ctx context.Context, accountID, userID
 		}
 
 		policy := &types.Policy{
-			ID:        policyID,
 			AccountID: accountID,
 			Name:      reverseProxy.Name,
 			Enabled:   true,
diff --git a/management/internals/modules/reverseproxy/reverseproxy.go b/management/internals/modules/reverseproxy/reverseproxy.go
index cf2a6035f..5107401cb 100644
--- a/management/internals/modules/reverseproxy/reverseproxy.go
+++ b/management/internals/modules/reverseproxy/reverseproxy.go
@@ -199,9 +199,10 @@ func operationToProtoType(op Operation) proto.ProxyMappingUpdateType {
 	}
 }
 
-func (r *ReverseProxy) FromAPIRequest(req *api.ReverseProxyRequest) {
+func (r *ReverseProxy) FromAPIRequest(req *api.ReverseProxyRequest, accountID string) {
 	r.Name = req.Name
 	r.Domain = req.Domain
+	r.AccountID = accountID
 
 	targets := make([]Target, 0, len(req.Targets))
 	for _, apiTarget := range req.Targets {