1 files changed, 9 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java
index e4f66640db1..145ffc92ab9 100644
--- a/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java
+++ b/plugins/org.eclipse.osee.framework.core.client/src/org/eclipse/osee/framework/core/client/internal/InternalClientSessionManager.java
@@ -133,9 +133,15 @@ public class InternalClientSessionManager {
                @Override
                public OseeCredential getCredential() {
                   OseeCredential credential = super.getCredential();
-                  String userName =
-                     OseeClientProperties.isInDbInit() ? SystemUser.BootStrap.getName() : System.getProperty(
-                        "user.name").toLowerCase();
+                  String userName;
+                  if (OseeClientProperties.isInDbInit()) {
+                     userName = SystemUser.BootStrap.getName();
+                  } else {
+                     userName = System.getProperty("user.name", SystemUser.Guest.getName());
+                     if (Strings.isValid(userName)) {
+                        userName = userName.toLowerCase();
+                     }
+                  }
                   credential.setUserName(userName);
                   credential.setDomain("");
                   credential.setPassword("");