diff --git a/package/lean/luci-app-openvpn-server/Makefile b/package/lean/luci-app-openvpn-server/Makefile
index b81630e88..822649610 100644
--- a/package/lean/luci-app-openvpn-server/Makefile
+++ b/package/lean/luci-app-openvpn-server/Makefile
@@ -10,7 +10,7 @@ LUCI_DEPENDS:=+openvpn-openssl +openvpn-easy-rsa
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-openvpn-server
 PKG_VERSION:=2.0
-PKG_RELEASE:=15
+PKG_RELEASE:=16
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/package/lean/luci-app-openvpn-server/luasrc/model/cbi/openvpn-server/openvpn-server.lua b/package/lean/luci-app-openvpn-server/luasrc/model/cbi/openvpn-server/openvpn-server.lua
index f4eb7749e..df795e4c9 100644
--- a/package/lean/luci-app-openvpn-server/luasrc/model/cbi/openvpn-server/openvpn-server.lua
+++ b/package/lean/luci-app-openvpn-server/luasrc/model/cbi/openvpn-server/openvpn-server.lua
@@ -99,7 +99,6 @@ if pid == "" then
   function start.write(self, section)
         luci.util.exec("uci set openvpn.myvpn.enabled=='1' &&  uci commit openvpn")
         message = luci.util.exec("/etc/init.d/openvpn start 2>&1")
-        luci.util.exec("/etc/init.d/openvpn enable")
         luci.util.exec("sleep 2")
         luci.http.redirect(
                 luci.dispatcher.build_url("admin", "vpn", "openvpn-server") .. "?message=" .. message
@@ -111,7 +110,6 @@ else
   function stop.write(self, section)
         luci.util.exec("uci set openvpn.myvpn.enabled=='0' &&  uci commit openvpn")
         luci.util.exec("/etc/init.d/openvpn stop")
-        luci.util.exec("/etc/init.d/openvpn disable")
         luci.util.exec("sleep 2")
         luci.http.redirect(
                 luci.dispatcher.build_url("admin", "vpn", "openvpn-server")
diff --git a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn
index 849754dfd..5afa99995 100755
--- a/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn
+++ b/package/lean/luci-app-openvpn-server/root/etc/uci-defaults/openvpn
@@ -39,7 +39,8 @@ uci set firewall.@forwarding[-1].dest="lan"
 uci commit firewall;
 /etc/init.d/firewall restart
 
-/etc/init.d/openvpn disable && /etc/init.d/openvpn stop
+/etc/init.d/openvpn enable
+/etc/init.d/openvpn stop
 
 rm -f /tmp/luci-indexcache
 exit 0