diff --git a/include/class-Log.php b/include/class-Log.php
index 3701509..61d1d3c 100644
--- a/include/class-Log.php
+++ b/include/class-Log.php
@@ -1,344 +1,360 @@
 <?php
 # Copyright (C) 2018-2023 Valerio Bozzolan
 # KISS Libre Hosting Panel
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 // make sure that this class is loaded at startup
 class_exists( User::class );
 class_exists( Domain::class );
 class_exists( Mailbox::class );
 class_exists( Mailforwardfrom::class );
 
 trait LogTrait {
 
 	/**
 	 * Get the log actor name
 	 *
 	 * @return string
 	 */
 	public function getLogActorFirm() {
 		return User::firm( $this->get( 'actor_uid' ) );
 	}
 
 	/**
 	 * Get the action family
 	 *
 	 * @return string
 	 */
 	public function getLogFamily() {
 		return $this->get( 'log_family' );
 	}
 
 	/**
 	 * Get the action
 	 */
 	public function getLogAction() {
 		return $this->get( 'log_action' );
 	}
 
 	/**
 	 * Get the action
 	 */
 	public function getLogDate() {
 		return $this->get( 'log_timestamp' );
 	}
 
+	/**
+	 * Get the UID of the User Marionette (user passively involved)
+	 *
+	 * @return string
+	 */
+	public function getLogMarionetteUID() {
+		return $this->get( 'marionette_uid' );
+	}
+
 	/**
 	 * Get the log message
 	 *
 	 * @param  array $args Arguments
 	 * @return self
 	 */
 	public function getLogMessage( $args ) {
 		$family = $this->getLogFamily();
 		$action = $this->getLogAction();
 
 		// trigger the right message family
 		switch( $family ) {
 			case 'domain':
 				return self::domainMessage( $action, $this, $args );
 			case 'mailbox':
 				return self::mailboxMessage( $action, $this, $args );
 			case 'mailforward':
 				return self::mailforwardMessage( $action, $this, $args );
 			case 'user':
 				return self::userMessage( $action, $this, $args );
 		}
 
 		return self::unknownAction( $family, $action );
 	}
 
 	/**
 	 * Get the log message alongside the date and the actor name
 	 *
 	 * @param  array $args Arguments
 	 * @return self
 	 */
 	public function getLogMessageWithDateAndUser( $args ) {
 
 		$actor = $args['actor'] ?? $this;
 
 		// create the Actor firm from the passed User object or from the Log
 		$actor_firm = $actor instanceof User
 			? $actor->getUserFirm()
 		        : $actor->getLogActorFirm();
 
 		return sprintf(
 			"%s - %s %s",
 			$this->getLogDate()->format( __( "Y-m-d H:i" ) ),
 			$actor_firm,
 			$this->getLogMessage( $args )
 		);
 	}
 
 	protected function normalizeLog() {
 		$this->datetimes( 'log_timestamp' );
 	}
 }
 
 /**
  * A generic log of an action
  *
  * Something happened. Dunno what.
  */
 class Log extends Queried {
 
 	use LogTrait;
 	use UserTrait;
 	use DomainTrait;
 	use MailboxTrait;
 	use MailforwardfromTrait;
 
 	public function __construct() {
 		$this->normalizeLog();
 	}
 
 	/**
 	 * Database table name
 	 */
 	const T = 'log';
 
 	/**
 	 * Generate a Domain-related message
 	 *
 	 * @param  string $action The related action name
 	 * @param  object $log
 	 * @param  array  $args Arguments
 	 * @return string Message
 	 */
 	public static function domainMessage( $action, $log, $args ) {
 
 		/**
 		 * You can pass some objects to build the message:
 		 *
 		 * A complete 'actor' User object
 		 * A complete 'domain' Domain object
 		 */
 		$domain = $args['domain'] ?? $log;
 		$plan   = $args['plan']   ?? $log;
 
 		switch( $action ) {
 
 			// an administrator created the Domain
 			case 'create':
 				return sprintf(
 					__( "created the domain %s" ),
 					$domain->getDomainFirm()
 				);
 
 			// an administrator has changed the Plan for a Domain
 			case 'plan.change':
 				return sprintf(
 					__( "changed the Plan for %s to %s" ),
 					$domain->getDomainFirm(),
 					esc_html( $plan->getPlanName() )
 				);
 		}
 
 		// default dummy message
 		return self::unknownAction( 'domain', $action );
 	}
 
 	/**
 	 * Generate a Mailbox-related message
 	 *
 	 * @param  string $action The related action name
 	 * @param  object $log
 	 * @param  array  $args Arguments
 	 * @return string Message
 	 */
 	public static function mailboxMessage( $action, $log, $args ) {
 
 		/**
 		 * You can pass some objects to build the message:
 		 *
 		 * A complete 'actor'   User object
 		 * A complete 'domain'  Domain object
 		 * A complete 'mailbox' Mailbox object
 		 */
 		$actor   = $args['actor']   ?? $log;
 		$domain  = $args['domain']  ?? $log;
 		$mailbox = $args['mailbox'] ?? $log;
 
 		$mailbox_firm = Mailbox::firm(
 			$domain->getDomainName(),
 			$mailbox->getMailboxUsername()
 		);
 
 		// trigger the right action message
 		switch( $action ) {
 
 			// the mailbox was created
 			case 'create':
 				return sprintf(
 					__( "created the mailbox %s" ),
 					$mailbox_firm
 				);
 
 			// the description was changed
 			case 'description.change':
 				return sprintf(
 					__( "edited description of %s" ),
 					$mailbox_firm
 				);
 
 			case 'newpassword':
 				return sprintf(
 					__( "reset password of %s" ),
 					$mailbox_firm
 				);
 		}
 
 		// default dummy message
 		return self::unknownAction( 'mailbox', $action );
 	}
 
 	/**
 	 * Generate a Mailforward-related message
 	 *
 	 * @param  string $action The related action name
 	 * @param  object $log
 	 * @param  array  $args Arguments
 	 * @return string Message
 	 */
 	public static function mailforwardMessage( $action, $log, $args ) {
 
 		/**
 		 * You can pass some objects to build the message:
 		 *
 		 * A complete 'domain'  Domain object
 		 * A complete 'mailbox' Mailbox object
 		 */
 		$domain      = $args['domain']      ?? $log;
 		$mailforward = $args['mailforward'] ?? $log;
 
 		if( $mailforward ) {
 			$firm = Mailforwardfrom::firm(
 				$domain->getDomainName(),
 				$mailforward->getMailforwardfromUsername()
 			);
 		} else {
 			$firm = $domain->getDomainFirm();
 		}
 
 		// trigger the right action message
 		switch( $action ) {
 
 			// a Mailforward destination was added
 			case 'add.destination':
 				return sprintf(
 					__( "added a destination for %s" ),
 					$firm
 				);
 
 			// a Mailforward destination was removed
 			case 'remove.destination':
 				return sprintf(
 					__( "removed a destination for %s" ),
 					$firm
 				);
 
 			// a Mailforward mailbox was created
 			case 'create':
 				return sprintf(
 					__( "created %s" ),
 					$firm
 				);
 
 			case 'delete':
 				return sprintf(
 					__( "deleted an %s mail forwarding" ),
 					$firm
 				);
 		}
 
 		// default dummy message
 		return self::unknownAction( 'mailforward', $action );
 
 	}
 
 	/**
 	 * Generate a User-related message
 	 *
 	 * @param  string $action The related action name
 	 * @param  object $log
 	 * @param  array  $args Arguments
 	 * @return string Message
 	 */
 	public static function userMessage( $action, $log, $args ) {
 
 		/**
 		 * You can pass some objects to build the message:
 		 *
 		 * A complete 'marionette' User object
 		 */
-		$marionette_uid = $log->marionette_uid ?? null;
+		$marionette = $args['marionette'] ?? null;
+
+		$marionette_uid = '?';
+		if( $args['marionette'] ) {
+			$marionette_uid = $marionette->getUserUID();
+		} else {
+			$marionette_uid = $log->getLogMarionetteUID();
+		}
 
 		$firm = '?';
 		if( $marionette_uid ) {
 			$firm = User::firm( $marionette_uid );
 		}
 
 		// trigger the right action message
 		switch( $action ) {
 
 			// an User creation
 			case 'create':
 				return sprintf(
 					__( "gave birth to %s" ),
 					$firm
 				);
 
 			// a password reset
 			case 'password.reset':
 				return sprintf(
 					__( "reset password for %s" ),
 					$firm
 				);
 		}
 
 		// default dummy message
 		return self::unknownAction( 'user', $action );
 
 	}
 
 	private static function unknownAction( $family, $action ) {
 		return esc_html( sprintf(
 			__( "misterious action about %s (%s)" ),
 			$family,
 			$action
 		) );
 	}
 }
diff --git a/template/user.php b/template/user.php
index f3f061a..663850a 100644
--- a/template/user.php
+++ b/template/user.php
@@ -1,131 +1,144 @@
 <?php
 # Copyright (C) 2020-2023 Valerio Bozzolan
 # KISS Libre Hosting Panel
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Affero General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 /*
  * This is the template for an User
  *
  * Called from:
  * 	user.php
  *
  * Available variables:
  * 	$user         object|null
  *	$new_password string|null
  *  $user_domains object|null (generator)
  */
 
 // unuseful when load directly
 defined( 'BOZ_PHP' ) or die;
 ?>
 
 <!-- name, surname, ... -->
 <form method="post" class="card">
 	<?php form_action( 'save-user' ) ?>
 
 	<div class="form-group">
 		<label for="user-email"><?= esc_html( __( "E-mail" ) ) ?></label>
 		<input type="email" name="email"<?= $user ? value( $user->getUserEmail() ) : '' ?> class="form-control" />
 	</div>
 	<div class="form-group">
 		<label for="user-name"><?= esc_html( __( "Name" ) ) ?></label>
 		<input type="text" name="name" id="user-name"<?= $user ? value( $user->getUserName() ) : '' ?> class="form-control" />
 	</div>
 	<div class="form-group">
 		<label for="user-surname"><?= esc_html( __( "Surname" ) ) ?></label>
 		<input type="text" name="surname" id="user-surname"<?= $user ? value( $user->getUserSurname() ) : '' ?> class="form-control" />
 	</div>
 	<div class="form-group">
 		<label for="user-uid"><?= esc_html( __( "Login" ) ) ?></label>
 		<input type="text" name="uid"<?= $user ? value( $user->getUserUID() ) : '' ?> class="form-control" />
 	</div>
 	<button type="submit" class="btn btn-primary"><?= esc_html( __( "Save" ) ) ?></button>
 </form>
 <!-- /name, surname -->
 
 <!-- user domains -->
 <?php if( $user_domains->valid() ): ?>
 <section>
 	<h3><?= esc_html( __( "Domains" ) ) ?></h3>
 	<ul>
 		<?php foreach( $user_domains as $domain ): ?>
 			<li><?= HTML::a(
 				$domain->getDomainPermalink(),
 				esc_html( $domain->getDomainName() )
 			) ?></li>
 		<?php endforeach ?>
 	</ul>
 </section>
 <?php endif ?>
 <!-- /user domains -->
 
 <!-- assign domain -->
 <?php if( $user && has_permission( 'edit-user-all' ) ): ?>
 <section>
 	<form method="post">
 		<h3><?= esc_html( __( "Add Domain" ) ) ?></h3>
 
 		<?php form_action( 'add-domain' ) ?>
 
 		<div class="form-group">
 			<label for="domain-name-search"><?= esc_html( __( "Domain Name" ) ) ?></label>
 			<input type="text" name="domain_name" id="domain-name-search" class="form-control" />
 		</div>
 
 		<button type="submit" class="btn btn-primary"><?= esc_html( __( "Add" ) ) ?></button>
 	</form>
 </section>
 <?php endif ?>
 <!-- /assign domain -->
 
 <!-- password handler -->
 <?php if( $user ): ?>
 	<section>
 		<form method="post">
 			<h3><?= esc_html( __( "Password" ) ) ?></h3>
 			<?php form_action( 'change-password' ) ?>
 
 			<p>
 				<?= esc_html( __( "The Password Reset is useful to immediately terminate your session and your soul." ) ) ?><br />
 				<?= esc_html( __( "Before proceeding, create a basin with your hands to cover the screen." ) ) ?><br />
 				<?= esc_html( __( "Stay ready to copy your new Password." ) ) ?>
 			</p>
 
 			<p>
 				<button type="submit" class="btn btn-primary"><?= esc_html( __( "Password Reset" ) ) ?></button>
 			</p>
 		</form>
 	</section>
 <?php endif ?>
 <!-- /password handler -->
 
 <!-- user last log actions -->
 <?php if( $user ): ?>
 
 	<section>
 		<h3><?= __( "Last Activity" ) ?></h3>
 
 		<?php
 			// print the last activities
 			ActivityPanel::spawn( [
 				'query' => [
 					'actor' => $user,
 				],
 			] )
 		?>
 	</section>
 
+	<section>
+		<h3><?= __( "Last Changes" ) ?></h3>
+
+		<?php
+			// print the last activities
+			ActivityPanel::spawn( [
+				'query' => [
+					'marionette' => $user,
+				],
+			] )
+		?>
+	</section>
+
 <?php endif ?>
 <!-- end user last log actions -->