diff --git a/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf b/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf
index ae69fee97d..52e1254f0f 100644
--- a/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf
+++ b/addons/field_rations/functions/fnc_addWaterSourceInteractions.sqf
@@ -18,10 +18,9 @@
 
 params ["_interactionType"];
 
-// Ignore when self-interaction, mounted vehicle interaction, or water source actions are disabled
+// Ignore during self-interaction or when water source actions are disabled
 if (
     _interactionType != 0
-    || {vehicle ACE_player != ACE_player}
     || {XGVAR(waterSourceActions) == 0}
 ) exitWith {};
 
@@ -56,8 +55,10 @@ TRACE_1("Starting interact PFH",_interactionType);
                                 _sourcesHelped pushBack _vehicle;
                                 // Add water source actions to the vehicle itself
                                 private _mainAction = [_vehicle, 0, ["ACE_MainActions"], GVAR(mainAction)] call EFUNC(interact_menu,addActionToObject);
+                                private _selfAction = [_vehicle, 1, ["ACE_SelfActions"], GVAR(mainAction)] call EFUNC(interact_menu,addActionToObject);
                                 {
                                     [_vehicle, 0, _mainAction, _x] call EFUNC(interact_menu,addActionToObject);
+                                    [_vehicle, 1, _selfAction, _x] call EFUNC(interact_menu,addActionToObject);
                                 } forEach GVAR(subActions);
                                 _vehicle setVariable [QGVAR(waterSourceActionsAdded), true];
                                 TRACE_3("Added interaction to vehicle",_x,typeOf _x,_waterRemaining);
diff --git a/addons/field_rations/functions/fnc_checkWater.sqf b/addons/field_rations/functions/fnc_checkWater.sqf
index 32167e6114..12a831a627 100644
--- a/addons/field_rations/functions/fnc_checkWater.sqf
+++ b/addons/field_rations/functions/fnc_checkWater.sqf
@@ -34,5 +34,7 @@ params ["_player", "_source"];
         };
     },
     {},
-    LLSTRING(CheckingWater)
+    LLSTRING(CheckingWater),
+    {true},
+    ["isNotInside"]
 ] call EFUNC(common,progressBar);
diff --git a/addons/field_rations/functions/fnc_drinkFromSource.sqf b/addons/field_rations/functions/fnc_drinkFromSource.sqf
index cf0d18018b..6199eaee7b 100644
--- a/addons/field_rations/functions/fnc_drinkFromSource.sqf
+++ b/addons/field_rations/functions/fnc_drinkFromSource.sqf
@@ -76,5 +76,6 @@ private _progressText = if (isNull _sourceConfig) then {
     _fnc_onSuccess,
     _fnc_onFailure,
     _progressText,
-    _fnc_condition
+    _fnc_condition,
+    ["isNotInside"]
 ] call EFUNC(common,progressBar);