diff --git a/core/chat/events.go b/core/chat/events.go
index 43372d9c0..6b25bc3fb 100644
--- a/core/chat/events.go
+++ b/core/chat/events.go
@@ -46,7 +46,9 @@ func (s *ChatServer) userNameChanged(eventData chatClientEvent) {
 	user.ChangeUsername(eventData.client.User.Id, receivedEvent.NewName)
 
 	// Update the connected clients associated user with the new name
+	now := time.Now()
 	eventData.client.User = savedUser
+	eventData.client.User.NameChangedAt = &now
 
 	// Send chat event letting everyone about about the name change
 	savedUser.DisplayName = receivedEvent.NewName