diff --git a/Source/GlobalAssemblyInfo.cs b/Source/GlobalAssemblyInfo.cs
index 4e5fde9f3b..e0c2cd31d9 100644
--- a/Source/GlobalAssemblyInfo.cs
+++ b/Source/GlobalAssemblyInfo.cs
@@ -6,5 +6,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2026.5.30.0")]
-[assembly: AssemblyFileVersion("2026.5.30.0")]
+[assembly: AssemblyVersion("2026.7.4.0")]
+[assembly: AssemblyFileVersion("2026.7.4.0")]
diff --git a/Source/NETworkManager.Localization/Resources/StaticStrings.resx b/Source/NETworkManager.Localization/Resources/StaticStrings.resx
index e9ca7ea40d..897bf115a8 100644
--- a/Source/NETworkManager.Localization/Resources/StaticStrings.resx
+++ b/Source/NETworkManager.Localization/Resources/StaticStrings.resx
@@ -277,7 +277,7 @@
     <value>iexplore.exe</value>
   </data>
   <data name="ExampleCustomCommandVariableHostname" xml:space="preserve">
-    <value>https://$$HOSTNAME$$/</value>
+    <value>https://{{Hostname}}/</value>
   </data>
   <data name="InternetExplorer" xml:space="preserve">
     <value>Internet Explorer</value>
diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
index fca07f29c8..8e687be8a2 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
+++ b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
@@ -3018,7 +3018,43 @@ public static string Description {
                 return ResourceManager.GetString("Description", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to Placeholder.
+        /// </summary>
+        public static string Placeholder {
+            get {
+                return ResourceManager.GetString("Placeholder", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Path to the file or executable to run. The following placeholders can be used:.
+        /// </summary>
+        public static string HelpMessage_CustomCommandFilePath {
+            get {
+                return ResourceManager.GetString("HelpMessage_CustomCommandFilePath", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Arguments passed to the file or executable. The following placeholders can be used:.
+        /// </summary>
+        public static string HelpMessage_CustomCommandArguments {
+            get {
+                return ResourceManager.GetString("HelpMessage_CustomCommandArguments", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to The following placeholder can be used:.
+        /// </summary>
+        public static string HelpMessage_ProfileHostPlaceholder {
+            get {
+                return ResourceManager.GetString("HelpMessage_ProfileHostPlaceholder", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to Deselect all.
         /// </summary>
@@ -5064,18 +5100,6 @@ public static string HelpMessage_Credentials {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to The following variables are available:
-        ///
-        ///$$ipaddress$$	--&gt;	IP adresse
-        ///$$hostname$$	--&gt;	Hostname.
-        /// </summary>
-        public static string HelpMessage_CustomCommandVariables {
-            get {
-                return ResourceManager.GetString("HelpMessage_CustomCommandVariables", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to URL to a web service that can be reached via http or https and returns an IPv4 address e.g., &quot;xx.xx.xx.xx&quot; as response..
         /// </summary>
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
index f3c9912eec..de5c75f684 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.resx
+++ b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -477,6 +477,18 @@
   <data name="Description" xml:space="preserve">
     <value>Description</value>
   </data>
+  <data name="Placeholder" xml:space="preserve">
+    <value>Placeholder</value>
+  </data>
+  <data name="HelpMessage_CustomCommandFilePath" xml:space="preserve">
+    <value>Path to the file or executable to run. The following placeholders can be used:</value>
+  </data>
+  <data name="HelpMessage_CustomCommandArguments" xml:space="preserve">
+    <value>Arguments passed to the file or executable. The following placeholders can be used:</value>
+  </data>
+  <data name="HelpMessage_ProfileHostPlaceholder" xml:space="preserve">
+    <value>The following placeholder can be used:</value>
+  </data>
   <data name="DHCPEnabled" xml:space="preserve">
     <value>DHCP enabled</value>
   </data>
@@ -2244,12 +2256,6 @@ is disabled!</value>
   <data name="DeleteCustomCommandMessage" xml:space="preserve">
     <value>The selected custom command will be deleted permanently.</value>
   </data>
-  <data name="HelpMessage_CustomCommandVariables" xml:space="preserve">
-    <value>The following variables are available:
-
-$$ipaddress$$	--&gt;	IP adresse
-$$hostname$$	--&gt;	Hostname</value>
-  </data>
   <data name="Restart" xml:space="preserve">
     <value>Restart</value>
   </data>
diff --git a/Source/NETworkManager.Models/Network/IPScannerCustomCommand.cs b/Source/NETworkManager.Models/Network/IPScannerCustomCommand.cs
index 85574bf1a4..7ab60cd08b 100644
--- a/Source/NETworkManager.Models/Network/IPScannerCustomCommand.cs
+++ b/Source/NETworkManager.Models/Network/IPScannerCustomCommand.cs
@@ -10,10 +10,10 @@ public static List<CustomCommandInfo> GetDefaultList()
     {
         return new List<CustomCommandInfo>
         {
-            new(Guid.NewGuid(), "Edge", "cmd.exe", @"/c start microsoft-edge:http://$$ipaddress$$/"),
+            new(Guid.NewGuid(), "Edge", "cmd.exe", @"/c start microsoft-edge:http://{{IPAddress}}/"),
             new(Guid.NewGuid(), "Edge (https)", "cmd.exe",
-                @"/c start microsoft-edge:https://$$ipaddress$$/"),
-            new(Guid.NewGuid(), "Windows Explorer (c$)", "explorer.exe", @"\\$$ipaddress$$\c$")
+                @"/c start microsoft-edge:https://{{IPAddress}}/"),
+            new(Guid.NewGuid(), "Windows Explorer (c$)", "explorer.exe", @"\\{{IPAddress}}\c$")
         };
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager.Profiles/Application/PowerShell.cs b/Source/NETworkManager.Profiles/Application/PowerShell.cs
index ad9235a1bc..8121fd860c 100644
--- a/Source/NETworkManager.Profiles/Application/PowerShell.cs
+++ b/Source/NETworkManager.Profiles/Application/PowerShell.cs
@@ -1,5 +1,6 @@
 using NETworkManager.Models.PowerShell;
 using NETworkManager.Settings;
+using NETworkManager.Utilities;
 
 namespace NETworkManager.Profiles.Application;
 
@@ -20,11 +21,13 @@ public static PowerShellSessionInfo CreateSessionInfo(ProfileInfo profile)
                 : group.PowerShell_OverrideCommand
                     ? group.PowerShell_Command
                     : SettingsManager.Current.PowerShell_Command,
-            AdditionalCommandLine = profile.PowerShell_OverrideAdditionalCommandLine
-                ? profile.PowerShell_AdditionalCommandLine
-                : group.PowerShell_OverrideAdditionalCommandLine
-                    ? group.PowerShell_AdditionalCommandLine
-                    : SettingsManager.Current.PowerShell_AdditionalCommandLine,
+            AdditionalCommandLine = PlaceholderHelper.Resolve(
+                profile.PowerShell_OverrideAdditionalCommandLine
+                    ? profile.PowerShell_AdditionalCommandLine
+                    : group.PowerShell_OverrideAdditionalCommandLine
+                        ? group.PowerShell_AdditionalCommandLine
+                        : SettingsManager.Current.PowerShell_AdditionalCommandLine,
+                (PlaceholderHelper.Host, profile.Host)),
             ExecutionPolicy = profile.PowerShell_OverrideExecutionPolicy
                 ? profile.PowerShell_ExecutionPolicy
                 : group.PowerShell_OverrideExecutionPolicy
diff --git a/Source/NETworkManager.Profiles/Application/PuTTY.cs b/Source/NETworkManager.Profiles/Application/PuTTY.cs
index 454e701c8a..ff425ff576 100644
--- a/Source/NETworkManager.Profiles/Application/PuTTY.cs
+++ b/Source/NETworkManager.Profiles/Application/PuTTY.cs
@@ -1,5 +1,6 @@
 using NETworkManager.Models.PuTTY;
 using NETworkManager.Settings;
+using NETworkManager.Utilities;
 
 namespace NETworkManager.Profiles.Application;
 
@@ -55,11 +56,13 @@ public static PuTTYSessionInfo CreateSessionInfo(ProfileInfo profile)
                 : group.PuTTY_OverrideLogFileName
                     ? group.PuTTY_LogFileName
                     : SettingsManager.Current.PuTTY_LogFileName,
-            AdditionalCommandLine = profile.PuTTY_OverrideAdditionalCommandLine
-                ? profile.PuTTY_AdditionalCommandLine
-                : group.PuTTY_OverrideAdditionalCommandLine
-                    ? group.PuTTY_AdditionalCommandLine
-                    : SettingsManager.Current.PuTTY_AdditionalCommandLine
+            AdditionalCommandLine = PlaceholderHelper.Resolve(
+                profile.PuTTY_OverrideAdditionalCommandLine
+                    ? profile.PuTTY_AdditionalCommandLine
+                    : group.PuTTY_OverrideAdditionalCommandLine
+                        ? group.PuTTY_AdditionalCommandLine
+                        : SettingsManager.Current.PuTTY_AdditionalCommandLine,
+                (PlaceholderHelper.Host, profile.Host))
         };
     }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager.Profiles/Application/WebConsole.cs b/Source/NETworkManager.Profiles/Application/WebConsole.cs
index 2704183672..e1f990c49d 100644
--- a/Source/NETworkManager.Profiles/Application/WebConsole.cs
+++ b/Source/NETworkManager.Profiles/Application/WebConsole.cs
@@ -1,4 +1,5 @@
 using NETworkManager.Models.WebConsole;
+using NETworkManager.Utilities;
 
 namespace NETworkManager.Profiles.Application;
 
@@ -8,7 +9,7 @@ public static WebConsoleSessionInfo CreateSessionInfo(ProfileInfo profileInfo)
     {
         var info = new WebConsoleSessionInfo
         {
-            Url = profileInfo.WebConsole_Url
+            Url = PlaceholderHelper.Resolve(profileInfo.WebConsole_Url, (PlaceholderHelper.Host, profileInfo.Host))
         };
 
         return info;
diff --git a/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj b/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj
index ecabab5fa7..5af1160527 100644
--- a/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj
+++ b/Source/NETworkManager.Profiles/NETworkManager.Profiles.csproj
@@ -27,5 +27,6 @@
     <ItemGroup>
         <ProjectReference Include="..\NETworkManager.Models\NETworkManager.Models.csproj" />
         <ProjectReference Include="..\NETworkManager.Settings\NETworkManager.Settings.csproj" />
+        <ProjectReference Include="..\NETworkManager.Utilities\NETworkManager.Utilities.csproj" />
     </ItemGroup>
 </Project>
diff --git a/Source/NETworkManager.Profiles/ProfileInfo.cs b/Source/NETworkManager.Profiles/ProfileInfo.cs
index 3b36201016..80cb4937a4 100644
--- a/Source/NETworkManager.Profiles/ProfileInfo.cs
+++ b/Source/NETworkManager.Profiles/ProfileInfo.cs
@@ -465,7 +465,7 @@ public ProfileInfo(ProfileInfo profile)
     public int TigerVNC_Port { get; set; } = GlobalStaticConfiguration.TigerVNC_DefaultVNCPort;
 
     public bool WebConsole_Enabled { get; set; }
-    public string WebConsole_Url { get; set; }
+    public string WebConsole_Url { get; set; } = "https://{{Host}}";
 
     public bool SNMP_Enabled { get; set; }
     public bool SNMP_InheritHost { get; set; } = true;
diff --git a/Source/NETworkManager.Settings/SettingsManager.cs b/Source/NETworkManager.Settings/SettingsManager.cs
index dc3493591a..4bcc92ad9f 100644
--- a/Source/NETworkManager.Settings/SettingsManager.cs
+++ b/Source/NETworkManager.Settings/SettingsManager.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
 using System.Xml.Serialization;
 
 namespace NETworkManager.Settings;
@@ -698,6 +699,36 @@ private static void UpgradeToLatest(Version version)
 
             Current.General_ApplicationList[index] = neighborTableEntry;
         }
+
+        // IP Scanner - Custom commands
+        Log.Info("Migrating IP Scanner custom command placeholder syntax from \"$$var$$\" to \"{{Var}}\"...");
+
+        foreach (var customCommand in Current.IPScanner_CustomCommands)
+        {
+            var filePath = customCommand.FilePath;
+
+            if (!string.IsNullOrEmpty(filePath))
+            {
+                filePath = Regex.Replace(filePath, "\\$\\$ipaddress\\$\\$", "{{IPAddress}}", RegexOptions.IgnoreCase);
+                filePath = Regex.Replace(filePath, "\\$\\$hostname\\$\\$", "{{Hostname}}", RegexOptions.IgnoreCase);
+            }
+
+            var arguments = customCommand.Arguments;
+
+            if (!string.IsNullOrEmpty(arguments))
+            {
+                arguments = Regex.Replace(arguments, "\\$\\$ipaddress\\$\\$", "{{IPAddress}}", RegexOptions.IgnoreCase);
+                arguments = Regex.Replace(arguments, "\\$\\$hostname\\$\\$", "{{Hostname}}", RegexOptions.IgnoreCase);
+            }
+
+            if (filePath == customCommand.FilePath && arguments == customCommand.Arguments)
+                continue;
+
+            Log.Info($"Migrated custom command \"{customCommand.Name}\"...");
+
+            customCommand.FilePath = filePath;
+            customCommand.Arguments = arguments;
+        }
     }
     #endregion
 }
diff --git a/Source/NETworkManager.Utilities/PlaceholderHelper.cs b/Source/NETworkManager.Utilities/PlaceholderHelper.cs
new file mode 100644
index 0000000000..2e206f1c9e
--- /dev/null
+++ b/Source/NETworkManager.Utilities/PlaceholderHelper.cs
@@ -0,0 +1,53 @@
+using System.Text.RegularExpressions;
+
+namespace NETworkManager.Utilities;
+
+/// <summary>
+///     Helper class to resolve <c>{{name}}</c> placeholders in a string.
+/// </summary>
+public static class PlaceholderHelper
+{
+    /// <summary>
+    ///     Placeholder name for the host (e.g. of a profile).
+    /// </summary>
+    public const string Host = "host";
+
+    /// <summary>
+    ///     Placeholder name for a hostname.
+    /// </summary>
+    public const string Hostname = "hostname";
+
+    /// <summary>
+    ///     Placeholder name for an IP address.
+    /// </summary>
+    public const string IPAddress = "ipaddress";
+
+    /// <summary>
+    ///     Replaces a <c>{{name}}</c> placeholder (case-insensitive) with the given value.
+    /// </summary>
+    /// <param name="input">Input string that may contain the placeholder.</param>
+    /// <param name="name">Name of the placeholder, without the surrounding braces (e.g. <c>"hostname"</c>).</param>
+    /// <param name="value">Value to insert in place of the placeholder.</param>
+    /// <returns>The input with the placeholder resolved.</returns>
+    public static string Replace(string input, string name, string value)
+    {
+        return string.IsNullOrEmpty(input)
+            ? input
+            : Regex.Replace(input, $"\\{{\\{{{Regex.Escape(name)}\\}}\\}}", value ?? string.Empty,
+                RegexOptions.IgnoreCase);
+    }
+
+    /// <summary>
+    ///     Replaces multiple <c>{{name}}</c> placeholders (case-insensitive) with the given values.
+    /// </summary>
+    /// <param name="input">Input string that may contain the placeholders.</param>
+    /// <param name="placeholders">Placeholder name/value pairs to resolve, e.g. <c>(PlaceholderHelper.Host, "10.0.0.1")</c>.</param>
+    /// <returns>The input with all placeholders resolved.</returns>
+    public static string Resolve(string input, params (string name, string value)[] placeholders)
+    {
+        foreach (var (name, value) in placeholders)
+            input = Replace(input, name, value);
+
+        return input;
+    }
+}
diff --git a/Source/NETworkManager.Validators/WebConsoleProfileUrlValidator.cs b/Source/NETworkManager.Validators/WebConsoleProfileUrlValidator.cs
new file mode 100644
index 0000000000..c60fe56330
--- /dev/null
+++ b/Source/NETworkManager.Validators/WebConsoleProfileUrlValidator.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using System.Windows.Controls;
+using NETworkManager.Localization.Resources;
+using NETworkManager.Utilities;
+
+namespace NETworkManager.Validators;
+
+/// <summary>
+///     Validates the WebConsole URL field on a profile, which may contain the <c>{{Host}}</c> placeholder.
+/// </summary>
+public class WebConsoleProfileUrlValidator : ValidationRule
+{
+    public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+    {
+        // Substitute the {{Host}} placeholder with a dummy host so the structural
+        // URL validation (scheme, format) still applies, without rejecting the placeholder itself.
+        var input = PlaceholderHelper.Replace(value as string ?? "", PlaceholderHelper.Host, "placeholder-host");
+
+        return Uri.TryCreate(input, UriKind.Absolute, out var uriResult) &&
+               (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps)
+            ? ValidationResult.ValidResult
+            : new ValidationResult(false, Strings.EnterValidWebsiteUri);
+    }
+}
diff --git a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
index 70c4685d07..c5321a0d50 100644
--- a/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
+++ b/Source/NETworkManager/ViewModels/IPScannerViewModel.cs
@@ -20,7 +20,6 @@
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -581,15 +580,15 @@ private async Task CustomCommand(object guid)
             var hostname = !string.IsNullOrEmpty(SelectedResult.Hostname) ? SelectedResult.Hostname.TrimEnd('.') : "";
             var ipAddress = SelectedResult.PingInfo.IPAddress.ToString();
 
-            info.FilePath = Regex.Replace(info.FilePath, "\\$\\$hostname\\$\\$", hostname, RegexOptions.IgnoreCase);
-            info.FilePath = Regex.Replace(info.FilePath, "\\$\\$ipaddress\\$\\$", ipAddress, RegexOptions.IgnoreCase);
+            info.FilePath = PlaceholderHelper.Resolve(info.FilePath,
+                (PlaceholderHelper.Hostname, hostname),
+                (PlaceholderHelper.IPAddress, ipAddress));
 
             if (!string.IsNullOrEmpty(info.Arguments))
             {
-                info.Arguments = Regex.Replace(info.Arguments, "\\$\\$hostname\\$\\$", hostname,
-                    RegexOptions.IgnoreCase);
-                info.Arguments = Regex.Replace(info.Arguments, "\\$\\$ipaddress\\$\\$", ipAddress,
-                    RegexOptions.IgnoreCase);
+                info.Arguments = PlaceholderHelper.Resolve(info.Arguments,
+                    (PlaceholderHelper.Hostname, hostname),
+                    (PlaceholderHelper.IPAddress, ipAddress));
             }
 
             try
diff --git a/Source/NETworkManager/ViewModels/ImportProfilesResultViewModel.cs b/Source/NETworkManager/ViewModels/ImportProfilesResultViewModel.cs
index 395603eb60..b99b0dc755 100644
--- a/Source/NETworkManager/ViewModels/ImportProfilesResultViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ImportProfilesResultViewModel.cs
@@ -205,6 +205,7 @@ private static ObservableCollection<ImportApplicationToggleItem> BuildApplicatio
             new ImportApplicationToggleItem(ProfileName.PowerShell, true),
             new ImportApplicationToggleItem(ProfileName.PuTTY),
             new ImportApplicationToggleItem(ProfileName.TigerVNC),
+            new ImportApplicationToggleItem(ProfileName.WebConsole),
             new ImportApplicationToggleItem(ProfileName.SNMP),
             new ImportApplicationToggleItem(ProfileName.Whois),
             new ImportApplicationToggleItem(ProfileName.IPGeolocation)
@@ -251,6 +252,9 @@ private static void ApplyToolDefaults(ProfileInfo profile, ProfileName tool)
                 profile.TigerVNC_Enabled = true;
                 profile.TigerVNC_Host = profile.Host;
                 break;
+            case ProfileName.WebConsole:
+                profile.WebConsole_Enabled = true;
+                break;
             case ProfileName.SNMP:
                 profile.SNMP_Enabled = true;
                 profile.SNMP_Host = profile.Host;
diff --git a/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs b/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs
index 4ac3744aae..c41c4552d6 100644
--- a/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs
@@ -638,7 +638,8 @@ private Task Connect(string host = null)
                 EnableRemoteConsole = instance.EnableRemoteConsole,
                 Host = instance.Host,
                 Command = instance.Command,
-                AdditionalCommandLine = instance.AdditionalCommandLine,
+                AdditionalCommandLine = PlaceholderHelper.Resolve(instance.AdditionalCommandLine,
+                    (PlaceholderHelper.Host, instance.Host)),
                 ExecutionPolicy = instance.ExecutionPolicy
             };
 
diff --git a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
index 7745f8c34f..1acf9bfc63 100644
--- a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
@@ -574,7 +574,8 @@ private Task Connect(string host = null)
                 LogMode = SettingsManager.Current.PuTTY_LogMode,
                 LogFileName = SettingsManager.Current.PuTTY_LogFileName,
                 LogPath = PuTTYProfile.LogPath,
-                AdditionalCommandLine = instance.AdditionalCommandLine
+                AdditionalCommandLine = PlaceholderHelper.Resolve(instance.AdditionalCommandLine,
+                    (PlaceholderHelper.Host, instance.ConnectionMode == ConnectionMode.Serial ? null : instance.Host))
             };
 
             // Add to history
diff --git a/Source/NETworkManager/Views/CustomCommandChildWindow.xaml b/Source/NETworkManager/Views/CustomCommandChildWindow.xaml
index 03ef60c940..4b1b23228d 100644
--- a/Source/NETworkManager/Views/CustomCommandChildWindow.xaml
+++ b/Source/NETworkManager/Views/CustomCommandChildWindow.xaml
@@ -87,11 +87,53 @@
             <Rectangle Grid.Column="4" Grid.Row="2"
                        Width="24" Height="24"
                        VerticalAlignment="Top"
-                       ToolTip="{x:Static localization:Strings.HelpMessage_CustomCommandVariables}"
                        Style="{StaticResource HelpImageRectangle}">
-                <Rectangle.Resources>
-                    <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
-                </Rectangle.Resources>
+                <Rectangle.ToolTip>
+                    <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                        <StackPanel>
+                            <TextBlock Text="{x:Static localization:Strings.HelpMessage_CustomCommandFilePath}"
+                                       Style="{StaticResource DefaultTextBlock}"
+                                       TextWrapping="Wrap" Margin="0,0,0,8" />
+                            <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.Resources>
+                                        <Style TargetType="{x:Type TextBlock}">
+                                            <Setter Property="Padding" Value="6,3" />
+                                            <Setter Property="VerticalAlignment" Value="Center" />
+                                        </Style>
+                                    </Grid.Resources>
+
+                                    <!-- Header row -->
+                                    <TextBlock Grid.Row="0" Grid.Column="0"
+                                               Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                    <TextBlock Grid.Row="0" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                    <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                               Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                    <!-- Placeholders -->
+                                    <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{IPAddress}}" />
+                                    <TextBlock Grid.Row="2" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.IPAddress}" />
+                                    <TextBlock Grid.Row="3" Grid.Column="0" Text="{}{{Hostname}}" />
+                                    <TextBlock Grid.Row="3" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Hostname}" />
+                                </Grid>
+                            </Border>
+                        </StackPanel>
+                    </ToolTip>
+                </Rectangle.ToolTip>
             </Rectangle>
             <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Arguments}" />
             <TextBox x:Name="TextBoxArguments"
@@ -101,11 +143,53 @@
             <Rectangle Grid.Column="4" Grid.Row="4"
                        Width="24" Height="24"
                        VerticalAlignment="Top"
-                       ToolTip="{x:Static localization:Strings.HelpMessage_CustomCommandVariables}"
                        Style="{StaticResource HelpImageRectangle}">
-                <Rectangle.Resources>
-                    <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
-                </Rectangle.Resources>
+                <Rectangle.ToolTip>
+                    <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                        <StackPanel>
+                            <TextBlock Text="{x:Static localization:Strings.HelpMessage_CustomCommandArguments}"
+                                       Style="{StaticResource DefaultTextBlock}"
+                                       TextWrapping="Wrap" Margin="0,0,0,8" />
+                            <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.Resources>
+                                        <Style TargetType="{x:Type TextBlock}">
+                                            <Setter Property="Padding" Value="6,3" />
+                                            <Setter Property="VerticalAlignment" Value="Center" />
+                                        </Style>
+                                    </Grid.Resources>
+
+                                    <!-- Header row -->
+                                    <TextBlock Grid.Row="0" Grid.Column="0"
+                                               Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                    <TextBlock Grid.Row="0" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                    <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                               Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                    <!-- Placeholders -->
+                                    <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{IPAddress}}" />
+                                    <TextBlock Grid.Row="2" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.IPAddress}" />
+                                    <TextBlock Grid.Row="3" Grid.Column="0" Text="{}{{Hostname}}" />
+                                    <TextBlock Grid.Row="3" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Hostname}" />
+                                </Grid>
+                            </Border>
+                        </StackPanel>
+                    </ToolTip>
+                </Rectangle.ToolTip>
             </Rectangle>
         </Grid>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
diff --git a/Source/NETworkManager/Views/GroupChildWindow.xaml b/Source/NETworkManager/Views/GroupChildWindow.xaml
index 0fc75ff188..38676ab0b2 100644
--- a/Source/NETworkManager/Views/GroupChildWindow.xaml
+++ b/Source/NETworkManager/Views/GroupChildWindow.xaml
@@ -1428,6 +1428,51 @@
                                          Text="{Binding PowerShell_AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                          IsEnabled="{Binding PowerShell_OverrideAdditionalCommandLine}"
                                          Style="{StaticResource DefaultTextBox}" />
+                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="6"
+                                           Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                                    <Rectangle.ToolTip>
+                                        <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                                            <StackPanel>
+                                                <TextBlock Text="{x:Static localization:Strings.HelpMessage_ProfileHostPlaceholder}"
+                                                           Style="{StaticResource DefaultTextBlock}"
+                                                           TextWrapping="Wrap" Margin="0,0,0,8" />
+                                                <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                                        BorderThickness="1" CornerRadius="2">
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                        </Grid.RowDefinitions>
+                                                        <Grid.Resources>
+                                                            <Style TargetType="{x:Type TextBlock}">
+                                                                <Setter Property="Padding" Value="6,3" />
+                                                                <Setter Property="VerticalAlignment" Value="Center" />
+                                                            </Style>
+                                                        </Grid.Resources>
+
+                                                        <!-- Header row -->
+                                                        <TextBlock Grid.Row="0" Grid.Column="0"
+                                                                   Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                                        <TextBlock Grid.Row="0" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                                        <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                                                   Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                                        <!-- Placeholder -->
+                                                        <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{Host}}" />
+                                                        <TextBlock Grid.Row="2" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Host}" />
+                                                    </Grid>
+                                                </Border>
+                                            </StackPanel>
+                                        </ToolTip>
+                                    </Rectangle.ToolTip>
+                                </Rectangle>
                                 <CheckBox Grid.Column="0" Grid.Row="8"
                                           Content="{x:Static localization:Strings.ExecutionPolicy}"
                                           IsChecked="{Binding PowerShell_OverrideExecutionPolicy}"
@@ -1597,10 +1642,55 @@
                                 <TextBox Grid.Column="2" Grid.Row="18" Text="{Binding PuTTY_AdditionalCommandLine}"
                                          IsEnabled="{Binding PuTTY_OverrideAdditionalCommandLine}"
                                          Style="{StaticResource DefaultTextBox}" />
+                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="18"
+                                           Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                                    <Rectangle.ToolTip>
+                                        <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                                            <StackPanel>
+                                                <TextBlock Text="{x:Static localization:Strings.HelpMessage_ProfileHostPlaceholder}"
+                                                           Style="{StaticResource DefaultTextBlock}"
+                                                           TextWrapping="Wrap" Margin="0,0,0,8" />
+                                                <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                                        BorderThickness="1" CornerRadius="2">
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                        </Grid.RowDefinitions>
+                                                        <Grid.Resources>
+                                                            <Style TargetType="{x:Type TextBlock}">
+                                                                <Setter Property="Padding" Value="6,3" />
+                                                                <Setter Property="VerticalAlignment" Value="Center" />
+                                                            </Style>
+                                                        </Grid.Resources>
+
+                                                        <!-- Header row -->
+                                                        <TextBlock Grid.Row="0" Grid.Column="0"
+                                                                   Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                                        <TextBlock Grid.Row="0" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                                        <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                                                   Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                                        <!-- Placeholder -->
+                                                        <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{Host}}" />
+                                                        <TextBlock Grid.Row="2" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Host}" />
+                                                    </Grid>
+                                                </Border>
+                                            </StackPanel>
+                                        </ToolTip>
+                                    </Rectangle.ToolTip>
+                                </Rectangle>
                             </Grid>
                         </StackPanel>
                     </ScrollViewer>
-                </TabItem>                
+                </TabItem>
                 <TabItem Header="{x:Static localization:Strings.TigerVNC}">
                     <ScrollViewer HorizontalScrollBarVisibility="Disabled">
                         <StackPanel Margin="0,0,0,20">
diff --git a/Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml b/Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml
index 40daf75d76..bc72bb2b29 100644
--- a/Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml
+++ b/Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml
@@ -34,6 +34,7 @@
                 <ColumnDefinition Width="1*" />
                 <ColumnDefinition Width="10" />
                 <ColumnDefinition Width="1*" />
+                <ColumnDefinition Width="34" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -81,6 +82,51 @@
             <TextBox x:Name="TextBoxAdditionalCommandLine" Grid.Column="2" Grid.Row="4"
               Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
               Style="{StaticResource DefaultTextBox}" />
+            <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="4"
+                       Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                <Rectangle.ToolTip>
+                    <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                        <StackPanel>
+                            <TextBlock Text="{x:Static localization:Strings.HelpMessage_ProfileHostPlaceholder}"
+                                       Style="{StaticResource DefaultTextBlock}"
+                                       TextWrapping="Wrap" Margin="0,0,0,8" />
+                            <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.Resources>
+                                        <Style TargetType="{x:Type TextBlock}">
+                                            <Setter Property="Padding" Value="6,3" />
+                                            <Setter Property="VerticalAlignment" Value="Center" />
+                                        </Style>
+                                    </Grid.Resources>
+
+                                    <!-- Header row -->
+                                    <TextBlock Grid.Row="0" Grid.Column="0"
+                                               Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                    <TextBlock Grid.Row="0" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                    <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                               Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                    <!-- Placeholder -->
+                                    <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{Host}}" />
+                                    <TextBlock Grid.Row="2" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Host}" />
+                                </Grid>
+                            </Border>
+                        </StackPanel>
+                    </ToolTip>
+                </Rectangle.ToolTip>
+            </Rectangle>
             <TextBlock Grid.Column="0" Grid.Row="6" Text="{x:Static localization:Strings.ExecutionPolicy}" />
             <ComboBox x:Name="ComboBoxTypes" Grid.Column="2" Grid.Row="6" ItemsSource="{Binding ExecutionPolicies}"
                SelectedItem="{Binding ExecutionPolicy}" />
diff --git a/Source/NETworkManager/Views/PowerShellSettingsView.xaml b/Source/NETworkManager/Views/PowerShellSettingsView.xaml
index 14409048e9..5d30cc99f3 100644
--- a/Source/NETworkManager/Views/PowerShellSettingsView.xaml
+++ b/Source/NETworkManager/Views/PowerShellSettingsView.xaml
@@ -49,8 +49,54 @@
                  HorizontalAlignment="Left" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10" />
         <TextBlock Text="{x:Static localization:Strings.AdditionalCommandLine}"
                    Style="{DynamicResource DefaultTextBlock}" Margin="0,0,0,10" />
-        <TextBox Width="250" Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                 HorizontalAlignment="Left" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10" />
+        <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
+            <TextBox Width="250" Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                     HorizontalAlignment="Left" Style="{StaticResource DefaultTextBox}" />
+            <Rectangle Width="24" Height="24" Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                <Rectangle.ToolTip>
+                    <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                        <StackPanel>
+                            <TextBlock Text="{x:Static localization:Strings.HelpMessage_ProfileHostPlaceholder}"
+                                       Style="{StaticResource DefaultTextBlock}"
+                                       TextWrapping="Wrap" Margin="0,0,0,8" />
+                            <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.Resources>
+                                        <Style TargetType="{x:Type TextBlock}">
+                                            <Setter Property="Padding" Value="6,3" />
+                                            <Setter Property="VerticalAlignment" Value="Center" />
+                                        </Style>
+                                    </Grid.Resources>
+
+                                    <!-- Header row -->
+                                    <TextBlock Grid.Row="0" Grid.Column="0"
+                                               Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                    <TextBlock Grid.Row="0" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                    <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                               Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                    <!-- Placeholder -->
+                                    <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{Host}}" />
+                                    <TextBlock Grid.Row="2" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Host}" />
+                                </Grid>
+                            </Border>
+                        </StackPanel>
+                    </ToolTip>
+                </Rectangle.ToolTip>
+            </Rectangle>
+        </StackPanel>
         <TextBlock Text="{x:Static localization:Strings.ExecutionPolicy}" Style="{DynamicResource DefaultTextBlock}"
                    Margin="0,0,0,10" />
         <ComboBox Width="250" ItemsSource="{Binding ExecutionPolicies}" SelectedItem="{Binding ExecutionPolicy}"
diff --git a/Source/NETworkManager/Views/ProfileChildWindow.xaml b/Source/NETworkManager/Views/ProfileChildWindow.xaml
index 90da9df9f3..3667e58066 100644
--- a/Source/NETworkManager/Views/ProfileChildWindow.xaml
+++ b/Source/NETworkManager/Views/ProfileChildWindow.xaml
@@ -2806,6 +2806,51 @@
                                          Text="{Binding PowerShell_AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                          IsEnabled="{Binding PowerShell_OverrideAdditionalCommandLine}"
                                          Style="{StaticResource DefaultTextBox}" />
+                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="12"
+                                           Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                                    <Rectangle.ToolTip>
+                                        <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                                            <StackPanel>
+                                                <TextBlock Text="{x:Static localization:Strings.HelpMessage_ProfileHostPlaceholder}"
+                                                           Style="{StaticResource DefaultTextBlock}"
+                                                           TextWrapping="Wrap" Margin="0,0,0,8" />
+                                                <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                                        BorderThickness="1" CornerRadius="2">
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                        </Grid.RowDefinitions>
+                                                        <Grid.Resources>
+                                                            <Style TargetType="{x:Type TextBlock}">
+                                                                <Setter Property="Padding" Value="6,3" />
+                                                                <Setter Property="VerticalAlignment" Value="Center" />
+                                                            </Style>
+                                                        </Grid.Resources>
+
+                                                        <!-- Header row -->
+                                                        <TextBlock Grid.Row="0" Grid.Column="0"
+                                                                   Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                                        <TextBlock Grid.Row="0" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                                        <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                                                   Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                                        <!-- Placeholder -->
+                                                        <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{Host}}" />
+                                                        <TextBlock Grid.Row="2" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Host}" />
+                                                    </Grid>
+                                                </Border>
+                                            </StackPanel>
+                                        </ToolTip>
+                                    </Rectangle.ToolTip>
+                                </Rectangle>
                                 <CheckBox Grid.Column="0" Grid.Row="14"
                                           Content="{x:Static localization:Strings.ExecutionPolicy}"
                                           IsChecked="{Binding PowerShell_OverrideExecutionPolicy}"
@@ -3131,6 +3176,51 @@
                                 <TextBox Grid.Column="2" Grid.Row="28" Text="{Binding PuTTY_AdditionalCommandLine}"
                                          IsEnabled="{Binding PuTTY_OverrideAdditionalCommandLine}"
                                          Style="{StaticResource DefaultTextBox}" />
+                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="28"
+                                           Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                                    <Rectangle.ToolTip>
+                                        <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                                            <StackPanel>
+                                                <TextBlock Text="{x:Static localization:Strings.HelpMessage_ProfileHostPlaceholder}"
+                                                           Style="{StaticResource DefaultTextBlock}"
+                                                           TextWrapping="Wrap" Margin="0,0,0,8" />
+                                                <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                                        BorderThickness="1" CornerRadius="2">
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                        </Grid.RowDefinitions>
+                                                        <Grid.Resources>
+                                                            <Style TargetType="{x:Type TextBlock}">
+                                                                <Setter Property="Padding" Value="6,3" />
+                                                                <Setter Property="VerticalAlignment" Value="Center" />
+                                                            </Style>
+                                                        </Grid.Resources>
+
+                                                        <!-- Header row -->
+                                                        <TextBlock Grid.Row="0" Grid.Column="0"
+                                                                   Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                                        <TextBlock Grid.Row="0" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                                        <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                                                   Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                                        <!-- Placeholder -->
+                                                        <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{Host}}" />
+                                                        <TextBlock Grid.Row="2" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Host}" />
+                                                    </Grid>
+                                                </Border>
+                                            </StackPanel>
+                                        </ToolTip>
+                                    </Rectangle.ToolTip>
+                                </Rectangle>
                             </Grid>
                         </StackPanel>
                     </ScrollViewer>
@@ -3248,11 +3338,56 @@
                                                  UpdateSourceTrigger="PropertyChanged">
                                             <Binding.ValidationRules>
                                                 <validators:EmptyValidator ValidatesOnTargetUpdated="True" />
-                                                <validators:HttpAndHttpsUriValidator ValidatesOnTargetUpdated="True" />
+                                                <validators:WebConsoleProfileUrlValidator ValidatesOnTargetUpdated="True" />
                                             </Binding.ValidationRules>
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
+                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="0"
+                                           Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                                    <Rectangle.ToolTip>
+                                        <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                                            <StackPanel>
+                                                <TextBlock Text="{x:Static localization:Strings.HelpMessage_ProfileHostPlaceholder}"
+                                                           Style="{StaticResource DefaultTextBlock}"
+                                                           TextWrapping="Wrap" Margin="0,0,0,8" />
+                                                <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                                        BorderThickness="1" CornerRadius="2">
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                        </Grid.RowDefinitions>
+                                                        <Grid.Resources>
+                                                            <Style TargetType="{x:Type TextBlock}">
+                                                                <Setter Property="Padding" Value="6,3" />
+                                                                <Setter Property="VerticalAlignment" Value="Center" />
+                                                            </Style>
+                                                        </Grid.Resources>
+
+                                                        <!-- Header row -->
+                                                        <TextBlock Grid.Row="0" Grid.Column="0"
+                                                                   Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                                        <TextBlock Grid.Row="0" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                                        <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                                                   Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                                        <!-- Placeholder -->
+                                                        <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{Host}}" />
+                                                        <TextBlock Grid.Row="2" Grid.Column="1"
+                                                                   Text="{x:Static localization:Strings.Host}" />
+                                                    </Grid>
+                                                </Border>
+                                            </StackPanel>
+                                        </ToolTip>
+                                    </Rectangle.ToolTip>
+                                </Rectangle>
                             </Grid>
                         </StackPanel>
                     </ScrollViewer>
diff --git a/Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml b/Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml
index f0f89aee3b..9bde7d772c 100644
--- a/Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml
+++ b/Source/NETworkManager/Views/PuTTYConnectChildWindow.xaml
@@ -214,6 +214,51 @@
             <TextBox x:Name="TextBoxAdditionalCommandLine" Grid.Column="2" Grid.Row="12"
                Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                Style="{StaticResource DefaultTextBox}" />
+            <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="12"
+                       Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                <Rectangle.ToolTip>
+                    <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                        <StackPanel>
+                            <TextBlock Text="{x:Static localization:Strings.HelpMessage_ProfileHostPlaceholder}"
+                                       Style="{StaticResource DefaultTextBlock}"
+                                       TextWrapping="Wrap" Margin="0,0,0,8" />
+                            <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.Resources>
+                                        <Style TargetType="{x:Type TextBlock}">
+                                            <Setter Property="Padding" Value="6,3" />
+                                            <Setter Property="VerticalAlignment" Value="Center" />
+                                        </Style>
+                                    </Grid.Resources>
+
+                                    <!-- Header row -->
+                                    <TextBlock Grid.Row="0" Grid.Column="0"
+                                               Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                    <TextBlock Grid.Row="0" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                    <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                               Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                    <!-- Placeholder -->
+                                    <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{Host}}" />
+                                    <TextBlock Grid.Row="2" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Host}" />
+                                </Grid>
+                            </Border>
+                        </StackPanel>
+                    </ToolTip>
+                </Rectangle.ToolTip>
+            </Rectangle>
         </Grid>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}"
diff --git a/Source/NETworkManager/Views/PuTTYSettingsView.xaml b/Source/NETworkManager/Views/PuTTYSettingsView.xaml
index d1aeb07729..40429b880f 100644
--- a/Source/NETworkManager/Views/PuTTYSettingsView.xaml
+++ b/Source/NETworkManager/Views/PuTTYSettingsView.xaml
@@ -151,8 +151,54 @@
         </TextBox>
         <TextBlock Text="{x:Static localization:Strings.AdditionalCommandLine}"
                    Style="{DynamicResource DefaultTextBlock}" Margin="0,0,0,10" />
-        <TextBox Width="250" Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                 HorizontalAlignment="Left" Style="{StaticResource DefaultTextBox}" Margin="0,0,0,10" />
+        <StackPanel Orientation="Horizontal" Margin="0,0,0,10">
+            <TextBox Width="250" Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                     HorizontalAlignment="Left" Style="{StaticResource DefaultTextBox}" />
+            <Rectangle Width="24" Height="24" Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
+                <Rectangle.ToolTip>
+                    <ToolTip Style="{StaticResource DefaultToolTip}" MaxWidth="320">
+                        <StackPanel>
+                            <TextBlock Text="{x:Static localization:Strings.HelpMessage_ProfileHostPlaceholder}"
+                                       Style="{StaticResource DefaultTextBlock}"
+                                       TextWrapping="Wrap" Margin="0,0,0,8" />
+                            <Border BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
+                                    BorderThickness="1" CornerRadius="2">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.Resources>
+                                        <Style TargetType="{x:Type TextBlock}">
+                                            <Setter Property="Padding" Value="6,3" />
+                                            <Setter Property="VerticalAlignment" Value="Center" />
+                                        </Style>
+                                    </Grid.Resources>
+
+                                    <!-- Header row -->
+                                    <TextBlock Grid.Row="0" Grid.Column="0"
+                                               Text="{x:Static localization:Strings.Placeholder}" FontWeight="Bold" />
+                                    <TextBlock Grid.Row="0" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Description}" FontWeight="Bold" />
+                                    <Rectangle Grid.Row="1" Grid.ColumnSpan="2" Grid.Column="0" Height="1"
+                                               Fill="{DynamicResource MahApps.Brushes.Gray8}" />
+
+                                    <!-- Placeholder -->
+                                    <TextBlock Grid.Row="2" Grid.Column="0" Text="{}{{Host}}" />
+                                    <TextBlock Grid.Row="2" Grid.Column="1"
+                                               Text="{x:Static localization:Strings.Host}" />
+                                </Grid>
+                            </Border>
+                        </StackPanel>
+                    </ToolTip>
+                </Rectangle.ToolTip>
+            </Rectangle>
+        </StackPanel>
         <TextBlock Text="{x:Static localization:Strings.SSHPort}" Style="{DynamicResource DefaultTextBlock}"
                    Margin="0,0,0,10" />
         <TextBox Width="250" HorizontalAlignment="Left"
diff --git a/Website/docs/application/ip-scanner.md b/Website/docs/application/ip-scanner.md
index a9263f2a27..25a5f33877 100644
--- a/Website/docs/application/ip-scanner.md
+++ b/Website/docs/application/ip-scanner.md
@@ -209,17 +209,17 @@ Custom commands that can be executed with a right click on the selected result.
 **Default:**
 
 | Name                  | File path      | Arguments                                        |
-| --------------------- | -------------- | ------------------------------------------------ |
-| Edge                  | `cmd.exe`      | `/c start microsoft-edge:http://$$ipaddress$$/`  |
-| Edge (https)          | `cmd.exe`      | `/c start microsoft-edge:https://$$ipaddress$$/` |
-| Windows Explorer (c$) | `explorer.exe` | `\\$$ipaddress$$\c$`                             |
+| --------------------- | -------------- | ------------------------------------------------- |
+| Edge                  | `cmd.exe`      | `/c start microsoft-edge:http://{{IPAddress}}/`  |
+| Edge (https)          | `cmd.exe`      | `/c start microsoft-edge:https://{{IPAddress}}/` |
+| Windows Explorer (c$) | `explorer.exe` | `\\{{IPAddress}}\c$`                             |
 
 In the arguments you can use the following placeholders:
 
-| Placeholder     | Description |
-| --------------- | ----------- |
-| `$$ipaddress$$` | IP address  |
-| `$$hostname$$`  | Hostname    |
+| Placeholder      | Description |
+| ---------------- | ------------ |
+| `{{IPAddress}}`  | IP address  |
+| `{{Hostname}}`   | Hostname    |
 
 :::note
 
diff --git a/Website/docs/application/powershell.md b/Website/docs/application/powershell.md
index b244736e0c..bd8f161e87 100644
--- a/Website/docs/application/powershell.md
+++ b/Website/docs/application/powershell.md
@@ -130,6 +130,12 @@ Additional command line arguments to pass to the PowerShell console when it is s
 
 **Default:** [`Settings > Additional command line`](#additional-command-line-3)
 
+:::note
+
+`{{Host}}` can be used to insert the [Host](#host) entered above.
+
+:::
+
 ### Execution policy
 
 Execution policy of the PowerShell console when it is started.
@@ -219,6 +225,12 @@ Additional command line arguments to pass to the PowerShell console when it is s
 
 **Default:** `Empty`
 
+:::note
+
+`{{Host}}` can be used to insert the profile's host.
+
+:::
+
 ### Execution policy
 
 Execution policy of the PowerShell console when it is started.
@@ -263,6 +275,12 @@ Additional command line arguments to pass to the PowerShell console when it is s
 
 **Default:** `Empty`
 
+:::note
+
+`{{Host}}` can be used to insert the profile's host.
+
+:::
+
 ### Execution policy
 
 Execution policy of the PowerShell console when it is started.
@@ -325,6 +343,12 @@ Default additional command line arguments to pass to the PowerShell console when
 
 **Default:** `Empty`
 
+:::note
+
+`{{Host}}` can be used to insert the host.
+
+:::
+
 ### Execution policy
 
 Default execution policy of the PowerShell console when it is started.
diff --git a/Website/docs/application/putty.md b/Website/docs/application/putty.md
index 385460e6b8..57e95245f0 100644
--- a/Website/docs/application/putty.md
+++ b/Website/docs/application/putty.md
@@ -208,6 +208,8 @@ Additional command line parameters to use for the connection which are appended.
 
 Additional command line parameters to use for the connection. For more information about the available parameters, see the [PuTTY documentation](https://the.earth.li/~sgtatham/putty/latest/htmldoc/Chapter3.html).
 
+`{{Host}}` can be used to insert the [Host](#host) entered above (not resolved if [Mode](#mode) is set to `Serial`, since there is no host in that mode).
+
 :::
 
 ## Profile
@@ -477,6 +479,8 @@ Additional command line parameters to use for the connection which are appended.
 
 Additional command line parameters to use for the connection. For more information about the available parameters, see the [PuTTY documentation](https://the.earth.li/~sgtatham/putty/latest/htmldoc/Chapter3.html).
 
+`{{Host}}` can be used to insert the profile's host.
+
 :::
 
 ## Group
@@ -609,6 +613,8 @@ Additional command line parameters to use for the connection which are appended.
 
 Additional command line parameters to use for the connection. For more information about the available parameters, see the [PuTTY documentation](https://the.earth.li/~sgtatham/putty/latest/htmldoc/Chapter3.html).
 
+`{{Host}}` can be used to insert the profile's host.
+
 :::
 
 ## Settings
@@ -775,6 +781,8 @@ Additional command line parameters to use for the connection which are appended.
 
 Additional command line parameters to use for the connection. For more information about the available parameters, see the [PuTTY documentation](https://the.earth.li/~sgtatham/putty/latest/htmldoc/Chapter3.html).
 
+`{{Host}}` can be used to insert the host.
+
 :::
 
 ### SSH port
diff --git a/Website/docs/application/web-console.md b/Website/docs/application/web-console.md
index 38d2a70d70..03dab959f3 100644
--- a/Website/docs/application/web-console.md
+++ b/Website/docs/application/web-console.md
@@ -52,6 +52,12 @@ URL of the website to display in the web console.
 
 **Example:** `https://pihole.borntoberoot.net/admin/`
 
+:::note
+
+`{{Host}}` can be used to insert the profile's host (e.g. `https://{{Host}}/`).
+
+:::
+
 ## Settings
 
 ### Show address bar
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index 29aede1745..6393991ec0 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -29,6 +29,7 @@ Release date: **xx.xx.2025**
 
 - **ARP Table** has been renamed to **[Neighbor Table](../application/neighbor-table.md)**. The application list entry is automatically migrated on first launch. Other view settings (auto-refresh interval, export file type/path) reset to their defaults. [#3403](https://github.com/BornToBeRoot/NETworkManager/pull/3403)
 - **IP Scanner** export: The `ARPMACAddress` and `ARPVendor` columns have been removed from CSV, XML and JSON exports. Use `MACAddress` and `Vendor` instead, which contain the same value (ARP/NDP preferred, NetBIOS as fallback). [#3403](https://github.com/BornToBeRoot/NETworkManager/pull/3403)
+- **IP Scanner** custom commands: The placeholder syntax has changed from `$$ipaddress$$` / `$$hostname$$` to `{{IPAddress}}` / `{{Hostname}}`. Existing custom commands are automatically migrated on first launch.
 
 ## What's new?
 
@@ -89,6 +90,11 @@ Release date: **xx.xx.2025**
 
 - MAC address resolution now uses ARP (IPv4) or NDP (IPv6) from the neighbor cache, with NetBIOS as fallback. The detail panel shows a single **MAC Address** section instead of separate ARP and NetBIOS entries. [#3403](https://github.com/BornToBeRoot/NETworkManager/pull/3403)
 
+**Profiles**
+
+- **WebConsole** URL, **PowerShell** additional command line, and **PuTTY** additional command line now support a `{{Host}}` placeholder (e.g. `https://{{Host}}/`) that is resolved to the profile's host each time a connection is established, so it always reflects the current host even after later edits. For PowerShell and PuTTY, the placeholder also resolves in the ad-hoc **Connect** dialog, using the host entered there. A help icon next to each field shows the available placeholder. [#3511](https://github.com/BornToBeRoot/NETworkManager/pull/3511)
+- New profiles pre-fill the **WebConsole** URL with `https://{{Host}}`, and profile import (CSV, Active Directory) can now also enable **WebConsole** for imported profiles. [#3511](https://github.com/BornToBeRoot/NETworkManager/pull/3511)
+
 **Dashboard**
 
 - Added a **Refresh** button (with animated feedback) to the **Network Connection**, **IP Geolocation**, and **DNS Resolver** widgets. The global reload button in the Status Window has been removed, as each widget now has its own. [#3447](https://github.com/BornToBeRoot/NETworkManager/pull/3447)