diff --git a/EnableSSHRemoting.psm1 b/EnableSSHRemoting.psm1
index 3bc3569..c66bb88 100644
--- a/EnableSSHRemoting.psm1
+++ b/EnableSSHRemoting.psm1
@@ -325,6 +325,12 @@ function Enable-SSHRemoting
         [switch] $Force
     )
 
+    # Detect platform
+    $platformInfo = [PlatformInfo]::new()
+    DetectPlatform $platformInfo
+    Write-Verbose "Platform information"
+    Write-Verbose "$($platformInfo | Out-String)"
+        
     # Non-Windows platforms must run this cmdlet as 'root'
     if (!$platformInfo.isWindows)
     {
@@ -353,16 +359,14 @@ function Enable-SSHRemoting
         }
     }
 
-    # Detect platform
-    $platformInfo = [PlatformInfo]::new()
-    DetectPlatform $platformInfo
-    Write-Verbose "Platform information"
-    Write-Verbose "$($platformInfo | Out-String)"
-
     # Detect SSH client installation
     if (! (Get-Command -Name ssh -ErrorAction SilentlyContinue))
-    {
-        Write-Warning "SSH client is not installed or not discoverable on this machine. SSH client must be installed before PowerShell SSH based remoting can be enabled."
+    {   
+        $SSHCFound = $false
+        $SSHCFound = (Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0).Online
+        if (! $SSHCFound) {
+            Write-Warning "SSH client is not installed or not discoverable on this machine. SSH client must be installed before PowerShell SSH based remoting can be enabled."
+        }
     }
 
     # Detect SSHD server installation
@@ -370,6 +374,9 @@ function Enable-SSHRemoting
     if ($platformInfo.IsWindows)
     {
         $SSHDFound = $null -ne (Get-Service -Name sshd -ErrorAction SilentlyContinue)
+        If (! $SSHDFound) {
+            $SSHDFound = (Add-WindowsCapability -Online -Name OpenSSH.Server~~~~0.0.1.0).Online
+        }
     }
     elseif ($platformInfo.IsLinux)
     {