diff --git a/modules/data/webadmin/tmpl/del_network.tmpl b/modules/data/webadmin/tmpl/del_network.tmpl
index 00ff85cf..886efbc0 100644
--- a/modules/data/webadmin/tmpl/del_network.tmpl
+++ b/modules/data/webadmin/tmpl/del_network.tmpl
@@ -13,7 +13,7 @@
                     <input type="hidden" name="name" value="<? VAR Network ?>" />
 					<div class="yesnobutton"><input type="submit" value="<? FORMAT "Yes" ?>"/></div>
 				</form>
-				<form action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>listusers" method="get">
+				<form action="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>edituser?user=<? VAR Username ?>" method="get">
 					<div class="yesnobutton"><input type="submit" value="<? FORMAT "No" ?>"/></div>
 				</form>
 			</div>
diff --git a/src/po/znc.pot b/src/po/znc.pot
index b959a8cd..32ebc7e3 100644
--- a/src/po/znc.pot
+++ b/src/po/znc.pot
@@ -62,7 +62,11 @@ msgstr ""
 msgid "Invalid port"
 msgstr ""
 
+<<<<<<< HEAD
 #: znc.cpp:1813 ClientCommand.cpp:1655
+=======
+#: znc.cpp:1821 ClientCommand.cpp:1655
+>>>>>>> 1.8.x
 msgid "Unable to bind: {1}"
 msgstr ""
 
@@ -234,7 +238,11 @@ msgstr ""
 msgid "Usage: /attach <#chans>"
 msgstr ""
 
+<<<<<<< HEAD
 #: Client.cpp:1345 Client.cpp:1367 ClientCommand.cpp:129 ClientCommand.cpp:151
+=======
+#: Client.cpp:1344 Client.cpp:1366 ClientCommand.cpp:129 ClientCommand.cpp:151
+>>>>>>> 1.8.x
 #: ClientCommand.cpp:423 ClientCommand.cpp:450
 msgid "There was {1} channel matching [{2}]"
 msgid_plural "There were {1} channels matching [{2}]"