diff --git a/package/gluon-mesh-vpn-core/Makefile b/package/gluon-mesh-vpn-core/Makefile
index 057d3bface76bc5d2b933d1b82c5943cde1416ab..b822ac05c13bc1be0036ccc48ba1a7f4a6a12cb9 100644
--- a/package/gluon-mesh-vpn-core/Makefile
+++ b/package/gluon-mesh-vpn-core/Makefile
@@ -12,6 +12,7 @@ define Package/gluon-mesh-vpn-core
   CATEGORY:=Gluon
   TITLE:=Basic support for connecting meshes via VPN tunnels
   DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables +iptables-mod-extra +simple-tc
+  USERID:=:gluon-mesh-vpn=800
 endef
 
 define Build/Prepare
diff --git a/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn b/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn
index ad89db8d18ef078c1030eea53a8bb9fc99a8478b..d02bb7f6ea28dfb22634d35526aeaeac323c844b 100755
--- a/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn
+++ b/package/gluon-mesh-vpn-core/luasrc/lib/gluon/upgrade/500-mesh-vpn
@@ -39,8 +39,6 @@ end
 users.remove_user('gluon-fastd')
 users.remove_group('gluon-fastd')
 
-users.add_group('gluon-mesh-vpn', 800)
-
 uci:section('firewall', 'include', 'mesh_vpn_dns', {
 	type = 'restore',
 	path = '/lib/gluon/mesh-vpn/iptables.rules',