diff --git a/src/main/java/com/commafeed/backend/feeds/FeedParser.java b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
index 26e0b042..f49ed2a0 100644
--- a/src/main/java/com/commafeed/backend/feeds/FeedParser.java
+++ b/src/main/java/com/commafeed/backend/feeds/FeedParser.java
@@ -94,7 +94,7 @@ public class FeedParser {
 						FeedUtils.toAbsoluteUrl(item.getLink(), feed.getLink()),
 						2048));
 				entry.setUpdated(validateDate(getEntryUpdateDate(item)));
-				entry.setAuthor(FeedUtils.truncate(item.getAuthor(), 128));
+				entry.setAuthor(item.getAuthor());
 
 				FeedEntryContent content = new FeedEntryContent();
 				content.setContent(getContent(item));
diff --git a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
index 34209e1a..9a8a8a54 100644
--- a/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
+++ b/src/main/java/com/commafeed/backend/services/FeedUpdateService.java
@@ -42,6 +42,8 @@ public class FeedUpdateService {
 
 		FeedEntry update = null;
 		if (existing == null) {
+			entry.setAuthor(FeedUtils.truncate(FeedUtils.handleContent(
+					entry.getAuthor(), feed.getLink(), true), 128));
 			FeedEntryContent content = entry.getContent();
 			content.setTitle(FeedUtils.truncate(FeedUtils.handleContent(
 					content.getTitle(), feed.getLink(), true), 2048));
@@ -70,5 +72,4 @@ public class FeedUpdateService {
 			metricsBean.entryUpdated(statusUpdateList.size());
 		}
 	}
-
 }