diff --git a/module/applications/ui/chatLog.mjs b/module/applications/ui/chatLog.mjs
index fc3208f1..cc42df2f 100644
--- a/module/applications/ui/chatLog.mjs
+++ b/module/applications/ui/chatLog.mjs
@@ -135,7 +135,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
     async actionUseButton(event, message) {
         const { moveIndex, actionIndex, movePath } = event.currentTarget.dataset;
         const targetUuid = event.currentTarget.closest('.action-use-button-parent').querySelector('select')?.value;
-        const parent = await foundry.utils.fromUuid(message.system.actor);
+        const parent = await foundry.utils.fromUuid(targetUuid || message.system.actor)
 
         const actionType = message.system.moves[moveIndex].actions[actionIndex];
         const cls = game.system.api.models.actions.actionsTypes[actionType.type];
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index 3c755234..3f49f7aa 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -350,7 +350,7 @@ export const defaultRestOptions = {
                                 value: {
                                     custom: {
                                         enabled: true,
-                                        formula: '100'
+                                        formula: '@system.resources.hitPoints.max'
                                     }
                                 }
                             }
@@ -416,7 +416,7 @@ export const defaultRestOptions = {
                                 value: {
                                     custom: {
                                         enabled: true,
-                                        formula: '100'
+                                        formula: '@system.armorScore'
                                     }
                                 }
                             }