diff --git a/craftenv.ps1 b/craftenv.ps1
index 316d2f592..da7784c19 100644
--- a/craftenv.ps1
+++ b/craftenv.ps1
@@ -1,132 +1,136 @@
 
 #    this file sets some environment variables that are needed
 #    for finding programs and libraries etc.
 #    by Hannah von Reth <vonreth@kde.org>
 #    you should copy CraftSettings.ini.template to ..\etc\CraftSettings.ini
 #    and adapt it to your needs (see that file for more info)
 
 cls
 
 $env:CraftRoot=[System.IO.Path]::GetDirectoryName($myInvocation.MyCommand.Definition)
 
 &{
 [version]$minPythonVersion = 3.6
 
 function findPython([string] $name)
 {
-    if ($env:CRAFT_PYTHON) {
+    if ($env:CRAFT_PYTHON -and (Test-Path -path $env:CRAFT_PYTHON)) {
         return
     }
     if ($PSVersionTable.Platform -eq "Unix" -and $env:CRAFT_PYTHON -eq $null) {
         $env:CRAFT_PYTHON = $name
     } else {
         $py = (Get-Command $name -ErrorAction SilentlyContinue)
         if ($py -and ($py | Get-Member Version) -and $py.Version -ge $minPythonVersion) {
             $env:CRAFT_PYTHON=$py.Source
         }
     }
 }
 
-$py = (Get-Command py -ErrorAction SilentlyContinue).Name
-if ($py) {
-    findPython(&$py -3 -c "import sys; print(sys.executable)")
-}
-findPython("python3.6")
-findPython("python3")
-findPython("python")
-
 function readINI([string] $fileName)
 {
    $ini = @{}
 
   switch -regex -file $fileName {
     "^\[(.+)\]$" {
       $section = $matches[1].Trim()
       $ini[$section] = @{}
     }
     "^\s*([^#].+?)\s*=\s*(.*)" {
       $name,$value = $matches[1..2]
       $ini[$section][$name] = $value.Trim()
     }
   }
   $ini
 }
 
 
 if(test-path -path $env:CraftRoot\..\etc\kdesettings.ini)
 {
     mv $env:CraftRoot\..\etc\kdesettings.ini $env:CraftRoot\..\etc\CraftSettings.ini
 }
 
 if(test-path -path $env:CraftRoot\..\etc\CraftSettings.ini)
 {
     $settings = readINI $env:CraftRoot\..\etc\CraftSettings.ini
 }
 else
 {
     Write-Error("$env:CraftRoot\..\etc\CraftSettings.ini Does not exist")
     break
 }
 
-if( -Not $env:CRAFT_PYTHON)
+if($settings["Paths"].Contains("Python") -and (Test-Path -path $settings["Paths"]["Python"]))
 {
-    $env:CRAFT_PYTHON=[IO.PATH]::COMBINE($settings["Paths"]["Python"], "python")
+    # prefer the python from the settings
+    $env:PATH = "{0}{1}$env:PATH" -f $settings["Paths"]["Python"], [IO.Path]::PathSeparator
 }
+else
+{
+    $py = (Get-Command py -ErrorAction SilentlyContinue).Name
+    if ($py) {
+        findPython(&$py -3 -c "import sys; print(sys.executable)")
+    }
+}
+
+findPython("python3.6")
+findPython("python3")
+findPython("python")
 }
 
 function Global:craft()
 {
     return & $env:CRAFT_PYTHON ([IO.PATH]::COMBINE("$env:CraftRoot", "bin", "craft.py")) $args
 }
 
 function Global:cb([string] $package, [string] $target="")
 {
     $command = @()
     if ($target) {
         $command += @("--target", $target)
     }
     $command += @("-q", "--ci-mode", "--get", "buildDir()", $package)
     $dir = craft @command | Out-String
     if($LASTEXITCODE) {
         Write-Host $dir
     } else {
         cd "$dir".Trim()
     }
 }
 
 function Global:cs([string] $package, [string] $target="")
 {
     $command = @()
     if ($target) {
         $command += @("--target", $target)
     }
     $command += @("-q", "--ci-mode", "--get", "sourceDir()", $package)
     $dir = craft @command | Out-String
     if($LASTEXITCODE) {
         Write-Host $dir
     } else {
         cd "$dir".Trim()
     }
 }
 
 function Global:cr()
 {
     cd $env:CraftRoot/..
 }
 
 
 if($args.Length -ne 0)
 {
     craft --run $args
 } else {
     (& $env:CRAFT_PYTHON ([IO.PATH]::COMBINE("$env:CraftRoot", "bin", "CraftSetupHelper.py")) "--setup") |
     foreach {
         if ($_ -match "=") {
             $v = $_.split("=", 2)
             set-item -force -path "ENV:\$($v[0])"  -value "$($v[1])"
             #Write-Host("$v[0]=$v[1]")
         }
     }
     cr
 }