diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars
index 05c04dea..6efdf0eb 100644
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@@ -5121,25 +5121,7 @@
// Process any SSH actions
switch (data.action) {
- case 'sshauth': {
- sshTunnelAuthDialog(data, p13sshConnectEx);
- /*
- var x = '';
- x += addHtmlValue("Authentication", '')
- x += addHtmlValue("Username", '');
- x += '
';
- x += addHtmlValue("Password", '');
- x += '
';
- x += addHtmlValue("Key File", '');
- x += addHtmlValue("Key Password", '');
- x += '
';
- x += '';
- x += '
' + "Key file must be in OpenSSH format." + '
';
- setDialogMode(2, "Authentication", 11, p13sshConnectEx, x, 'ssh');
- setTimeout(sshAuthUpdate, 50);
- */
- break;
- }
+ case 'sshauth': { sshTunnelAuthDialog(data, p13sshConnectEx); break; }
case 'autherror': { p13setConsoleMsg("Authentication Error", 5000); return; }
case 'connectionerror': { p13setConsoleMsg("Connection Error", 5000); return; }
case 'sessionerror': { p13setConsoleMsg("Session expired", 5000); return; }
diff --git a/webserver.js b/webserver.js
index 49b45474..825acbc1 100644
--- a/webserver.js
+++ b/webserver.js
@@ -1271,7 +1271,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
const targets = ['*', 'server-users', user._id];
if (user.groups) { for (var i in user.groups) { targets.push('server-users:' + i); } }
const ua = getUserAgentInfo(req);
- const loginEvent = { etype: 'user', userid: user._id, username: user.name, account: obj.CloneSafeUser(user), action: 'login', msgid: 107, msgArgs: [req.clientIp, ua.browserStr, ua.osStr], msg: 'Account login', domain: domain.id, ip: req.clientIp, userAgent: req.headers['user-agent'] };
+ const loginEvent = { etype: 'user', userid: user._id, username: user.name, account: obj.CloneSafeUser(user), action: 'login', msgid: 107, msgArgs: [req.clientIp, ua.browserStr, ua.osStr], msg: 'Account login from ' + req.clientIp + ', ' + ua.browserStr + ', ' + ua.osStr, domain: domain.id, ip: req.clientIp, userAgent: req.headers['user-agent'] };
if (loginOptions != null) {
if ((loginOptions.tokenName != null) && (loginOptions.tokenUser != null)) { loginEvent.tokenName = loginOptions.tokenName; loginEvent.tokenUser = loginOptions.tokenUser; } // If a login token was used, add it to the event.
if (loginOptions.twoFactorType != null) { loginEvent.twoFactorType = loginOptions.twoFactorType; }