diff --git a/Server/Services/RcImplementations/ViewerPageDataProvider.cs b/Server/Services/RcImplementations/ViewerPageDataProvider.cs index a5c6d5e4..e8ce62fb 100644 --- a/Server/Services/RcImplementations/ViewerPageDataProvider.cs +++ b/Server/Services/RcImplementations/ViewerPageDataProvider.cs @@ -21,8 +21,19 @@ namespace Remotely.Server.Services.RcImplementations public string GetUserDisplayName(PageModel pageModel) { + if (string.IsNullOrWhiteSpace(pageModel?.User?.Identity?.Name)) + { + return string.Empty; + } + var user = _dataService.GetUserByNameWithOrg(pageModel.User.Identity.Name); - return user.UserOptions?.DisplayName ?? user.UserName; + + if (user is null) + { + return string.Empty; + } + + return user.UserOptions?.DisplayName ?? user.UserName ?? string.Empty; } public ViewerPageTheme GetTheme(PageModel pageModel)