diff --git a/mods/last_callers.js b/mods/last_callers.js
index 1ff6dbd8..72f97317 100644
--- a/mods/last_callers.js
+++ b/mods/last_callers.js
@@ -105,13 +105,16 @@ exports.getModule = class LastCallersModule extends MenuModule {
 								item.ts		= moment(item.timestamp).format(dateTimeFormat);						
 
 								User.getUserName(item.userId, (err, userName) => {
-									item.userName = userName;
+									item.userName = userName || 'N/A';
 
 									User.loadProperties(item.userId, getPropOpts, (err, props) => {
 										if(!err) {
 											item.location 		= props.location;
 											item.affiliation	= item.affils = props.affiliation;
-										} 
+										} else {
+											item.location		= 'N/A';
+											item.affiliation	= 'N/A';
+										}
 										return next();
 									});
 								});
diff --git a/mods/menu.hjson b/mods/menu.hjson
index 75ceaa31..ef4c4455 100644
--- a/mods/menu.hjson
+++ b/mods/menu.hjson
@@ -341,6 +341,7 @@
 		//	Canceling this form logs off vs falling back to matrix
 		//
 		newUserApplicationSsh: {
+			module: nua
 			art: NUA
 			fallback: logoff
 			options: {