diff --git a/Makefile b/Makefile
index 2bcfafcf84..3d02e9afbe 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ endif
 
 PACKAGES ?= $(shell go list ./...)
 SOURCES ?= $(shell find . -name "*.go" -type f -not -path "./node_modules/*")
-GENERATE ?= $(PACKAGES) $(IMPORT)/pkg/assets
+GENERATE ?= $(IMPORT)/pkg/assets
 
 TAGS ?=
 
@@ -79,7 +79,7 @@ lint:
 	for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done;
 
 .PHONY: generate
-generate:
+generate: protobuf webapp
 	go generate $(GENERATE)
 
 .PHONY: changelog
@@ -197,3 +197,8 @@ $(PROTO_SRC)/accounts.swagger.json: $(PROTO_SRC)/accounts.proto
 .PHONY: protobuf
 protobuf: $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger \
 		  $(PROTO_SRC)/accounts.pb.go $(PROTO_SRC)/accounts.pb.micro.go $(PROTO_SRC)/accounts.pb.web.go $(PROTO_SRC)/accounts.swagger.json
+
+.PHONY: webapp
+webapp:
+	yarn generate-api
+	yarn build
diff --git a/pkg/assets/embed.go b/pkg/assets/embed.go
index 0b2bc6a0a1..4b9b254250 100644
--- a/pkg/assets/embed.go
+++ b/pkg/assets/embed.go
@@ -1,5 +1,5 @@
-// Code generated by fileb0x at "2020-07-01 10:47:43.466579 +0200 CEST m=+0.004917707" from config file "embed.yml" DO NOT EDIT.
-// modification hash(7584f18725298c447104e0f01f48babf.8058aec596c5fb73022d09bb97af796e)
+// Code generated by fileb0x at "2020-07-01 11:39:14.734417 +0200 CEST m=+0.006772493" from config file "embed.yml" DO NOT EDIT.
+// modification hash(75ea29610fe7f7fa52cd0276c7e2565c.8058aec596c5fb73022d09bb97af796e)
 
 package assets
 
diff --git a/reflex.conf b/reflex.conf
index 3e496fb0b4..61ed9b137f 100644
--- a/reflex.conf
+++ b/reflex.conf
@@ -2,4 +2,4 @@
 -r '^(cmd|pkg)/.*\.go$' -R '^node_modules/' -s -- sh -c 'make bin/ocis-accounts && bin/ocis-accounts server --asset-path assets/'
 
 # frontend
--r '^ui/.*\.(vue|js)$' -R '^node_modules/' -- sh -c 'yarn build && make generate'
+-r '^ui/.*\.(vue|js)$' -R '^node_modules/' -- sh -c 'make generate'