diff --git a/modules/data/webadmin/tmpl/add_edit_network.tmpl b/modules/data/webadmin/tmpl/add_edit_network.tmpl
index 18f1b5fb29..a023971105 100644
--- a/modules/data/webadmin/tmpl/add_edit_network.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_network.tmpl
@@ -31,8 +31,9 @@
 			<div class="sectionbody">
 				<div class="subsection">
 					<div class="inputlabel"><label for="name"><? FORMAT "Network Name:" ?></label></div>
-					<input id="name" type="text" name="name" value="<? VAR Name ?>" class="half" maxlength="128"
+					<input id="name" type="text" name="name<? IF !NameEdit ?>_disabled<? ENDIF ?>" value="<? VAR Name ?>" class="half" maxlength="128"
 						   title="<? FORMAT "The name of the IRC network." ?>" <? IF !NameEdit ?>disabled<? ENDIF ?> />
+					<? IF !NameEdit ?><input type="hidden" name="name" value="<? VAR Name ?>"><? ENDIF ?>
 				</div>
 
             	<div class="subsection">
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index e401d96519..283f285abe 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -1030,20 +1030,20 @@ class CWebAdminMod : public CModule {
             if (spSession->IsAdmin() ||
                 !spSession->GetUser()->DenySetIdent()) {
                 Tmpl["IdentEdit"] = "true";
-                Tmpl["Ident"] = pNetwork->GetIdent();
             }
+            Tmpl["Ident"] = pNetwork->GetIdent();
 
             if (spSession->IsAdmin() ||
                 !spSession->GetUser()->DenySetRealName()) {
                 Tmpl["RealNameEdit"] = "true";
-                Tmpl["RealName"] = pNetwork->GetRealName();
             }
+            Tmpl["RealName"] = pNetwork->GetRealName();
 
             if (spSession->IsAdmin() ||
                 !spSession->GetUser()->DenySetQuitMsg()) {
                 Tmpl["QuitMsgEdit"] = "true";
-                Tmpl["QuitMsg"] = pNetwork->GetQuitMsg();
             }
+            Tmpl["QuitMsg"] = pNetwork->GetQuitMsg();
 
             Tmpl["NetworkEdit"] =
                 spSession->IsAdmin() || !spSession->GetUser()->DenySetNetwork()