diff --git a/.vscode/launch.json b/.vscode/launch.json
index 69b973c3..9efe9077 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -51,7 +51,7 @@
         "AYANOVA_USE_URLS": "http://*:7575;",
         "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles",
         "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles",       
-        "AYANOVA_SERVER_TEST_MODE":"true",
+        "AYANOVA_SERVER_TEST_MODE":"false",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL":"small",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET":"-7",
         "AYANOVA_BACKUP_PG_DUMP_PATH":"C:\\data\\code\\PostgreSQLPortable_12.0\\App\\PgSQL\\bin\\"
diff --git a/server/AyaNova/Controllers/LogoController.cs b/server/AyaNova/Controllers/LogoController.cs
index 604b73c1..65745bd5 100644
--- a/server/AyaNova/Controllers/LogoController.cs
+++ b/server/AyaNova/Controllers/LogoController.cs
@@ -85,15 +85,19 @@ namespace AyaNova.Api.Controllers
             switch (size)
             {
                 case "small":
+                    if (logo.Small == null)
+                        return NotFound();
                     return new FileStreamResult(new MemoryStream(logo.Small), Microsoft.Net.Http.Headers.MediaTypeHeaderValue.Parse(logo.SmallType));
 
                 case "medium":
+                    if (logo.Medium == null)
+                        return NotFound();
                     return new FileStreamResult(new MemoryStream(logo.Medium), Microsoft.Net.Http.Headers.MediaTypeHeaderValue.Parse(logo.MediumType));
 
                 case "large":
+                    if (logo.Large == null)
+                        return NotFound();
                     return new FileStreamResult(new MemoryStream(logo.Large), Microsoft.Net.Http.Headers.MediaTypeHeaderValue.Parse(logo.LargeType));
-
-
             }
             return NotFound(new ApiErrorResponse(ApiErrorCode.NOT_FOUND));
         }
diff --git a/server/AyaNova/Controllers/NotifyController.cs b/server/AyaNova/Controllers/NotifyController.cs
index c946c481..aedcccab 100644
--- a/server/AyaNova/Controllers/NotifyController.cs
+++ b/server/AyaNova/Controllers/NotifyController.cs
@@ -50,7 +50,14 @@ namespace AyaNova.Api.Controllers
             if (AyaNova.Core.License.ActiveKey.Status == AyaNova.Core.License.AyaNovaLicenseKey.LicenseStatus.ActiveTrial)
                 showSampleLogins = await AyaNova.Util.DbUtil.DBHasTrialUsersAsync(ct, log);
 
-            return Ok(ApiOkResponse.Response(showSampleLogins));
+            //confirm if there are logo's to show as well
+            var logo = await ct.Logo.AsNoTracking().SingleOrDefaultAsync();
+            bool HasSmallLogo = logo.Small != null;
+            bool HasMediumLogo = logo.Medium != null;
+            bool HasLargeLogo = logo.Large != null;
+
+
+            return Ok(ApiOkResponse.Response(new { eval = showSampleLogins, ll = HasLargeLogo, ml = HasMediumLogo, sl = HasSmallLogo }));
         }