diff --git a/plugins/network/form_network.cs b/plugins/network/form_network.cs
index 79b3ba4..c77be4f 100644
--- a/plugins/network/form_network.cs
+++ b/plugins/network/form_network.cs
@@ -23,6 +23,7 @@
 		<input type="hidden" tabindex="5" name="store" value="set_ip" />
 		<button type="submit"><?cs var:html_escape(Lang.Plugins.network.Button.NetworkIP) ?></button>
 	</p>
+	</form>
 </fieldset>
 
 <fieldset>
@@ -41,5 +42,6 @@
 		<input type="hidden" tabindex="5" name="store" value="set_gw" />
 		<button type="submit"><?cs var:html_escape(Lang.Plugins.network.Button.NetworkGW) ?></button>
 	</p>
-</form>
+	</form>
+</fieldset>
 
diff --git a/plugins/network/network.py b/plugins/network/network.py
index 3c16be7..5fac5a3 100644
--- a/plugins/network/network.py
+++ b/plugins/network/network.py
@@ -49,8 +49,10 @@ class network(cryptobox.plugins.base.CryptoBoxPlugin):
 		if redirected == "1":
 			self.cbox.log.debug("network plugin: redirected")
 			return "form_network"
-		## request for IP change?
 
+		if store is None:
+			pass
+		## request for IP change?
 		elif store == "set_ip":
 			self.cbox.log.debug("network plugin: changing IP")
 			try:
@@ -80,8 +82,9 @@ class network(cryptobox.plugins.base.CryptoBoxPlugin):
 				self.hdf["Data.Warning"] = "Plugins.network.InvalidIP"
 				self.__prepare_form_data()
 				return "form_network"
+		## request for default gateway change?
 		elif store == "set_gw":
-			## TODO
+			## TODO: route add default gw ...
 			pass
 		else:
 			self.cbox.log.debug("network plugin: show form")