diff --git a/ChangeLog b/ChangeLog
index fb886ee..208138e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,6 @@ Version 4.4.1.1 'Ardee West':
 	- OpenSSL 1.1.0 supported;
 	- shared secrets fixed in MongoDB: multiple secrets per realm allowed;
 	- shared secrets admin fixed in Redis;
-	- --oauth option now strictly requires oAuth authentication;
 
 12/24/2014 Oleg Moskalenko <mom040267@gmail.com>
 Version 4.3.3.1 'Tolomei':
diff --git a/TODO b/TODO
index 49ef28c..5fe9a16 100644
--- a/TODO
+++ b/TODO
@@ -75,23 +75,14 @@
 	deeply "hidden" in the network infrastructure that the 
 	significant code complication may be unjustified.
 
-2) HTTP or GUI status monitor and management.
-
-	For enterprise users, a management (configuration, status 
-	and statistics) GUI has to be implemented. Currently, all 
-	these features are available through the shell command 
-	line, telnet client and through Redis command line.
-
-3) Traffic recording (for selected allocations).
+2) Traffic recording (for selected allocations).
 
 	That would be a helpful feature for a large enterprise 
 	(for testing and security purposes). 
 
-4) Ganglia monitoring.
+3) Ganglia monitoring.
 
-5) Web API to the database (oAuth keys, for example).
-
-6) Key exchange mechanism for oAuth.
+4) Key exchange mechanism for oAuth.
 
 ==================================================================
 
diff --git a/src/apps/relay/userdb.c b/src/apps/relay/userdb.c
index c89eb80..57ac529 100644
--- a/src/apps/relay/userdb.c
+++ b/src/apps/relay/userdb.c
@@ -527,7 +527,7 @@ int get_user_key(int in_oauth, int *out_oauth, int *max_session_time, u08bits *u
 		}
 	}
 
-	if(in_oauth) {
+	if(out_oauth && *out_oauth) {
 		return ret;
 	}