diff --git a/admin/inc/class.admin_cmd.inc.php b/admin/inc/class.admin_cmd.inc.php
index fc711f175c..ad77f2b0c1 100644
--- a/admin/inc/class.admin_cmd.inc.php
+++ b/admin/inc/class.admin_cmd.inc.php
@@ -1306,6 +1306,16 @@ abstract class admin_cmd
 		return [];
 	}
 
+	/**
+	 * Return widget types (indexed by field key) for changes
+	 * Used by historylog widget to show the changes the command recorded.
+	 */
+	function get_change_widgets()
+	{
+		// TODO: Some kind of regex?
+		return [];
+	}
+
 	/**
 	 * Read change labels from descriptions in template:
 	 * - <description value="Expires" for="account_expires"/>
diff --git a/admin/inc/class.admin_cmd_edit_user.inc.php b/admin/inc/class.admin_cmd_edit_user.inc.php
index 0f50c26a7a..0fda593257 100644
--- a/admin/inc/class.admin_cmd_edit_user.inc.php
+++ b/admin/inc/class.admin_cmd_edit_user.inc.php
@@ -233,7 +233,28 @@ class admin_cmd_edit_user extends admin_cmd_change_pw
 	 */
 	function get_change_labels()
 	{
-		return $this->change_labels_from_template('admin.account');
+		$labels = $this->change_labels_from_template('admin.account');
+		$labels += array(
+			'account_firstname' => 'First name',
+			'account_lastname' => 'Last name',
+			'account_email' => 'Email',
+			'account_passwd_2' => false
+		);
+		return $labels;
+	}
+
+	/**
+	 * Return list of widgets to use for displaying changes
+	 */
+	function get_change_widgets() {
+		$widgets = parent::get_change_widgets();
+
+		$widgets += array(
+			'account_primary_group' => 'select-account',
+			'account_groups' => 'select-account',
+			'account_expires' => 'date-time'
+		);
+		return $widgets;
 	}
 
 	/**
diff --git a/admin/templates/default/account.xet b/admin/templates/default/account.xet
index 2d2ccd878b..af1482af1c 100644
--- a/admin/templates/default/account.xet
+++ b/admin/templates/default/account.xet
@@ -60,7 +60,7 @@
 					<description/>
 				</row>
 				<row>
-					<description value="Groups" for="groups"/>
+					<description value="Groups" for="account_groups"/>
 					<select-account account_type="groups" id="account_groups" multiple="true" class="et2_fullWidth" span="4" tags="true"/>
 					<description/>
 				</row>