diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index 5471a0b61..43a61aa7f 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -438,7 +438,7 @@ func forcePathSeparator(path string) {
 // This check is ignored under Windows since SSH remote login is not the main
 // method to login on Windows.
 func IsRunUserMatchCurrentUser(runUser string) (string, bool) {
-	if IsWindows {
+	if IsWindows || SSH.StartBuiltinServer {
 		return "", true
 	}