diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java
index 5caeb8f0a..5b9a217d7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/User.java
@@ -32,13 +32,11 @@ public class User extends BaseTemplateModel {
     		return "";
     	} 
 
-    	String firstName = currentUser.getFirstName();
-		String lastName = currentUser.getLastName();
-		if (firstName.isEmpty() && lastName.isEmpty()) {
-			return currentUser.getEmailAddress();
-		}
-		
-		return firstName + " " + lastName;
+    	if (currentUser.getFirstName().isEmpty()) {
+    		return currentUser.getEmailAddress();
+    	}
+    	
+    	return currentUser.getFirstName();
     }
     
     public String getFirstName() {