diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index edf21fc0..7ba0ea33 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -465,6 +465,7 @@ namespace Remotely.Server.Services
                 var org = RemotelyContext.Organizations
                     .Include(x => x.RemotelyUsers)
                     .FirstOrDefault(x => x.ID == organizationID);
+                RemotelyContext.Users.Add(user);
                 org.RemotelyUsers.Add(user);
                 await RemotelyContext.SaveChangesAsync();
                 return true;
@@ -872,7 +873,7 @@ namespace Remotely.Server.Services
             }
             return RemotelyContext.Users
                 .Include(x => x.Organization)
-                .FirstOrDefault(x => x.UserName == userName);
+                .FirstOrDefault(x => x.UserName.ToLower().Trim() == userName.ToLower().Trim());
         }
 
         public RemotelyUserOptions GetUserOptions(string userName)