diff --git a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
index 1247affe5..ba20540fe 100755
--- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
+++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter
@@ -27,13 +27,14 @@ if [ "$(uci -q get ucitrack.@network[-1].affects | grep openmptcprouter)" = "" ]
 		commit ucitrack
 	EOF
 fi
-if [ "$(uci -q get openmptcprouter.vps)" != "server" ]; then
+if [ "$(uci -q show openmptcprouter | grep server)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		set openmptcprouter.vps=server
+		set openmptcprouter.vps.username="openmptcprouter"
 		commit openmptcprouter
 	EOF
 fi
-if [ "$(uci -q get openmptcprouter.vps.master)" = "" ]; then
+if [ "$(uci -q get openmptcprouter.vps)" = "server" ] && [ "$(uci -q get openmptcprouter.vps.master)" = "" ]; then
 	uci -q batch <<-EOF >/dev/null
 		set openmptcprouter.vps.master=1
 		set openmptcprouter.vps.backup=0