diff --git a/TODO-SHADOW b/TODO-SHADOW
index 447dc22..0c31277 100644
--- a/TODO-SHADOW
+++ b/TODO-SHADOW
@@ -1,8 +1,6 @@
 Todo list for ShadowIRCd 6.1
 -----------------------------
 * notice/message !#channel and %#channel
-* Add a disable_oper option to auth {} to not allow users in that auth block
-  to use OPER.
 * Add default_operhost to /set
 
 Todo list for ShadowIRCd 6.2
@@ -12,3 +10,4 @@ Todo list for ShadowIRCd 6.2
 * pure TS6 compat mode for linking with charybdis/ratbox/etc.
 * TBAN equivalent (like a extban?) (?)
 * ELINE - command to make users kline/dline/xline exempt on-the-fly
+* implementation to change other users' umodes (if you're a oper of course)
diff --git a/doc/example.conf b/doc/example.conf
index a12c951..8ea9132 100755
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -551,7 +551,7 @@ general {
 	short_motd = no;
 	ping_cookie = no;
 	connect_timeout = 30 seconds;
-	ident_timeout = 5;
+	default_ident_timeout = 5;
 	disable_auth = no;
 	no_oper_flood = yes;
 	true_no_oper_flood = no;
diff --git a/doc/reference.conf b/doc/reference.conf
index 03fe668..fe082d7 100755
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -1301,7 +1301,7 @@ general {
 	/* ident timeout: Amount of time (in seconds) that the IRCd will
 	 * wait for a user to respond to an ident request.
 	 */
-	ident_timeout = 5;
+	default_ident_timeout = 5;
 
 	/* disable auth: disables identd checking */
 	disable_auth = no;
diff --git a/include/s_conf.h b/include/s_conf.h
index d4cc947..50f403d 100644
--- a/include/s_conf.h
+++ b/include/s_conf.h
@@ -212,7 +212,7 @@ struct config_file_entry
 	int min_nonwildcard_simple;
 	int default_floodcount;
 	int client_flood;
-	int ident_timeout;
+	int default_ident_timeout;
 	int use_egd;
 	int ping_cookie;
 	int tkline_expire_notices;
diff --git a/modules/m_info.c b/modules/m_info.c
index 428e354..0efc69d 100644
--- a/modules/m_info.c
+++ b/modules/m_info.c
@@ -140,9 +140,9 @@ static struct InfoStruct info_table[] = {
 		"Connect timeout for connections to servers"
 	},
 	{
-		"ident_timeout",
+		"default_ident_timeout",
 		OUTPUT_DECIMAL,
-		&ConfigFileEntry.ident_timeout,
+		&ConfigFileEntry.default_ident_timeout,
 		"Amount of time the server waits for ident responses from clients",
 	},
 	{
diff --git a/src/ircd.c b/src/ircd.c
index add5f65..b5f8076 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -324,8 +324,8 @@ initialize_global_set_options(void)
 		splitchecking = 1;
 	}
 
-	if(ConfigFileEntry.ident_timeout)
-		GlobalSetOptions.ident_timeout = ConfigFileEntry.ident_timeout;
+	if(ConfigFileEntry.default_ident_timeout)
+		GlobalSetOptions.ident_timeout = ConfigFileEntry.default_ident_timeout;
 	else
 		GlobalSetOptions.ident_timeout = IDENT_TIMEOUT;
 
diff --git a/src/newconf.c b/src/newconf.c
index 10ac5de..6321d40 100644
--- a/src/newconf.c
+++ b/src/newconf.c
@@ -2214,7 +2214,7 @@ static struct ConfEntry conf_general_table[] =
 	{ "collision_fnc",	CF_YESNO, NULL, 0, &ConfigFileEntry.collision_fnc	},
 	{ "connect_timeout",	CF_TIME,  NULL, 0, &ConfigFileEntry.connect_timeout	},
 	{ "default_floodcount", CF_INT,   NULL, 0, &ConfigFileEntry.default_floodcount	},
-	{ "ident_timeout",	CF_INT, NULL, 0, &ConfigFileEntry.ident_timeout		},
+	{ "default_ident_timeout",	CF_INT, NULL, 0, &ConfigFileEntry.default_ident_timeout		},
 	{ "disable_auth",	CF_YESNO, NULL, 0, &ConfigFileEntry.disable_auth	},
 	{ "dots_in_ident",	CF_INT,   NULL, 0, &ConfigFileEntry.dots_in_ident	},
 	{ "failed_oper_notice",	CF_YESNO, NULL, 0, &ConfigFileEntry.failed_oper_notice	},
diff --git a/src/s_conf.c b/src/s_conf.c
index a138e3e..de8695f 100644
--- a/src/s_conf.c
+++ b/src/s_conf.c
@@ -806,7 +806,7 @@ set_default_conf(void)
 	ConfigFileEntry.min_nonwildcard = 4;
 	ConfigFileEntry.min_nonwildcard_simple = 3;
 	ConfigFileEntry.default_floodcount = 8;
-	ConfigFileEntry.ident_timeout = 5;
+	ConfigFileEntry.default_ident_timeout = 5;
 	ConfigFileEntry.client_flood = CLIENT_FLOOD_DEFAULT;
 	ConfigFileEntry.tkline_expire_notices = 0;