diff --git a/gradle.properties b/gradle.properties
index 4224876f0..21320ea0e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=4.0.4
+version=4.0.5
 group=org.openmbee.mms
 
 springBootVersion=2.2.6.RELEASE
diff --git a/ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java b/ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java
index cdc21e6b4..01bde33e6 100644
--- a/ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java
+++ b/ldap/src/main/java/org/openmbee/mms/ldap/LdapSecurityConfig.java
@@ -190,13 +190,19 @@ public BaseLdapPathContextSource contextSource() {
     }
 
     private User saveLdapUser(DirContextOperations userData, User saveUser) {
-        if (!saveUser.getEmail().equals(userData.getStringAttribute(userAttributesEmail))) {
+        if (saveUser.getEmail() == null ||
+            !saveUser.getEmail().equals(userData.getStringAttribute(userAttributesEmail))
+        ) {
             saveUser.setEmail(userData.getStringAttribute(userAttributesEmail));
         }
-        if (!saveUser.getFirstName().equals(userData.getStringAttribute(userAttributesFirstName))) {
+        if (saveUser.getFirstName() == null ||
+            !saveUser.getFirstName().equals(userData.getStringAttribute(userAttributesFirstName))
+        ) {
             saveUser.setFirstName(userData.getStringAttribute(userAttributesFirstName));
         }
-        if (!saveUser.getLastName().equals(userData.getStringAttribute(userAttributesLastName))) {
+        if (saveUser.getLastName() == null ||
+            !saveUser.getLastName().equals(userData.getStringAttribute(userAttributesLastName))
+        ) {
             saveUser.setLastName(userData.getStringAttribute(userAttributesLastName));
         }