Index: binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs
===================================================================
--- binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs	(revision 426)
+++ binary-improvements2/WebServer/src/UrlHandlers/SessionHandler.cs	(revision 433)
@@ -90,7 +90,5 @@
 			}
 
-			AdminWebUsers.WebUser? webUser = AdminWebUsers.Instance.GetUser (username, password);
-
-			if (!webUser.HasValue) {
+			if (!AdminWebUsers.Instance.TryGetUser (username, password, out AdminWebUsers.WebUser webUser)) {
 				Log.Out ($"[Web] User/pass login failed from {_remoteEndpointString}");
 				WebUtils.WriteText (_context.Response, "UserPassInvalid", HttpStatusCode.Unauthorized);
@@ -98,5 +96,5 @@
 			}
 
-			HandleUserIdLogin (connectionHandler, _context, _remoteEndpointString, userPassLoginName, userPassErrorPage, webUser.Value.Name, webUser.Value.PlatformUser, webUser.Value.CrossPlatformUser);
+			HandleUserIdLogin (connectionHandler, _context, _remoteEndpointString, userPassLoginName, userPassErrorPage, webUser.Name, webUser.PlatformUser, webUser.CrossPlatformUser);
 		}