diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index a1bef79e3..5be7cd0b3 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -2,6 +2,7 @@
  - fixed: HttpProxy mixes original site's content encoding with WebGUI's
  - fixed: Thingy i18n has an empty message
  - fixed: Thingy has no icon
+ - fixed: Wiki page history shows username instead of alias
 
 7.5.6
  - fixed: events get start/end time even when none specified (also can offset start/end day)
diff --git a/lib/WebGUI/Asset/WikiPage.pm b/lib/WebGUI/Asset/WikiPage.pm
index 0c7681d52..010fac729 100644
--- a/lib/WebGUI/Asset/WikiPage.pm
+++ b/lib/WebGUI/Asset/WikiPage.pm
@@ -385,7 +385,7 @@ sub www_getHistory {
                         	.$icon->edit('func=edit;revision='.$revision->get("revisionDate"), $revision->get("url"))
                         	.$icon->view('func=view;revision='.$revision->get("revisionDate"), $revision->get("url")),
 			date => $date->epochToHuman($revision->get("revisionDate")),
-			username => $user->username,
+			username => $user->profileField('alias') || $user->username,
 			actionTaken => $revision->get("actionTaken"),
 			interval => join(" ", $date->secondsToInterval(time() - $revision->get("revisionDate")))
 			});