diff --git a/User.cpp b/User.cpp
index 6f2aeb87..4c7af3e5 100644
--- a/User.cpp
+++ b/User.cpp
@@ -445,6 +445,7 @@ bool CUser::Clone(const CUser& User, CString& sErrorRet, bool bCloneChans) {
 	// !CTCP Replies
 
 	// Flags
+	SetIRCConnectEnabled(User.GetIRCConnectEnabled());
 	SetKeepBuffer(User.KeepBuffer());
 	SetMultiClients(User.MultiClients());
 	SetBounceDCCs(User.BounceDCCs());
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 45c00c88..60f652d3 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -156,6 +156,7 @@ public:
 		pNewUser->SetTimezoneOffset(WebSock.GetParam("timezoneoffset").ToDouble());
 		pNewUser->SetJoinTries(WebSock.GetParam("jointries").ToUInt());
 		pNewUser->SetMaxJoins(WebSock.GetParam("maxjoins").ToUInt());
+		pNewUser->SetIRCConnectEnabled(WebSock.GetParam("doconnect").ToBool());
 
 		if (spSession->IsAdmin()) {
 			pNewUser->SetDenyLoadMod(WebSock.GetParam("denyloadmod").ToBool());
@@ -466,6 +467,7 @@ public:
 				Tmpl["TimezoneOffset"] = CString(pUser->GetTimezoneOffset());
 				Tmpl["JoinTries"] = CString(pUser->JoinTries());
 				Tmpl["MaxJoins"] = CString(pUser->MaxJoins());
+				Tmpl["IRCConnectEnabled"] = CString(pUser->GetIRCConnectEnabled());
 
 				const set<CString>& ssAllowedHosts = pUser->GetAllowedHosts();
 				for (set<CString>::const_iterator it = ssAllowedHosts.begin(); it != ssAllowedHosts.end(); ++it) {
@@ -506,6 +508,7 @@ public:
 				Tmpl["Action"] = "adduser";
 				Tmpl["Title"] = "Add User";
 				Tmpl["StatusPrefix"] = "*";
+				Tmpl["IRCConnectEnabled"] = "true";
 			}
 
 			// To change VHosts be admin or don't have DenySetVHost
diff --git a/modules/www/webadmin/add_edit_user.tmpl b/modules/www/webadmin/add_edit_user.tmpl
index ba390bf8..c33df9f8 100644
--- a/modules/www/webadmin/add_edit_user.tmpl
+++ b/modules/www/webadmin/add_edit_user.tmpl
@@ -91,6 +91,12 @@
 </textarea>
 				</td>
 			</tr>
+
+			<tr>
+				<td>Active:</td>
+				<td><input type="checkbox" class="checkbox" name="doconnect" id="doconnect_checkbox"<? IF IRCConnectEnabled ?> checked="checked"<? ENDIF ?> />
+					<label for="doconnect_checkbox">Connect to IRC &amp; automatically re-connect</label></td>
+			</tr>
 		</tbody>
 	</table>